diff --git a/_redirects b/_redirects
index 1f998c0..acbb5a2 100644
--- a/_redirects
+++ b/_redirects
@@ -1 +1,12 @@
 /tutorials/contributing /contributing 301
+/tutorials/nix-language /tutorials/first-steps/nix-language 301
+/tutorials/ad-hoc-developer-environments /tutorials/first-steps/ad-hoc-shell-environments 301
+/tutorials/towards-reproducibility-pinning-nixpkgs /tutorials/first-steps/towards-reproducibility-pinning-nixpkgs 301
+/tutorials/declarative-and-reproducible-developer-environments /tutorials/first-steps/declarative-and-reproducible-developer-environments 301
+/tutorials/dev-environment /tutorials/first-steps/dev-environment 301
+/tutorials/continuous-integration-github-actions /tutorials/nixos/continuous-integration-github-actions 301
+/tutorials/building-and-running-docker-images /tutorials/nixos/building-and-running-docker-images 301
+/tutorials/building-bootable-iso-image /tutorials/nixos/building-bootable-iso-image 301
+/tutorials/deploying-nixos-using-terraform /tutorials/nixos/deploying-nixos-using-terraform 301
+/tutorials/installing-nixos-on-a-raspberry-pi /tutorials/nixos/installing-nixos-on-a-raspberry-pi 301
+/tutorials/integration-testing-using-virtual-machines /tutorials/nixos/integration-testing-using-virtual-machines 301
diff --git a/source/tutorials/first-steps/ad-hoc-developer-environments.md b/source/tutorials/first-steps/ad-hoc-shell-environments.md
similarity index 100%
rename from source/tutorials/first-steps/ad-hoc-developer-environments.md
rename to source/tutorials/first-steps/ad-hoc-shell-environments.md
diff --git a/source/tutorials/first-steps/index.md b/source/tutorials/first-steps/index.md
index cba952e..deffa4c 100644
--- a/source/tutorials/first-steps/index.md
+++ b/source/tutorials/first-steps/index.md
@@ -9,7 +9,7 @@ You will also learn the Nix language, and use it to build portable, reproducible
 
 ```{toctree}
 :maxdepth: 1
-ad-hoc-developer-environments.md
+ad-hoc-shell-environments.md
 reproducible-scripts.md
 nix-language.md
 towards-reproducibility-pinning-nixpkgs.md
diff --git a/source/tutorials/nixos/build-and-deploy/building-and-running-docker-images.md b/source/tutorials/nixos/building-and-running-docker-images.md
similarity index 100%
rename from source/tutorials/nixos/build-and-deploy/building-and-running-docker-images.md
rename to source/tutorials/nixos/building-and-running-docker-images.md
diff --git a/source/tutorials/nixos/build-and-deploy/building-bootable-iso-image.md b/source/tutorials/nixos/building-bootable-iso-image.md
similarity index 100%
rename from source/tutorials/nixos/build-and-deploy/building-bootable-iso-image.md
rename to source/tutorials/nixos/building-bootable-iso-image.md
diff --git a/source/tutorials/nixos/build-and-deploy/continuous-integration-github-actions.md b/source/tutorials/nixos/continuous-integration-github-actions.md
similarity index 100%
rename from source/tutorials/nixos/build-and-deploy/continuous-integration-github-actions.md
rename to source/tutorials/nixos/continuous-integration-github-actions.md
diff --git a/source/tutorials/nixos/build-and-deploy/deploying-nixos-using-terraform.md b/source/tutorials/nixos/deploying-nixos-using-terraform.md
similarity index 100%
rename from source/tutorials/nixos/build-and-deploy/deploying-nixos-using-terraform.md
rename to source/tutorials/nixos/deploying-nixos-using-terraform.md
diff --git a/source/tutorials/nixos/index.md b/source/tutorials/nixos/index.md
index d011c39..08c5a5a 100644
--- a/source/tutorials/nixos/index.md
+++ b/source/tutorials/nixos/index.md
@@ -6,5 +6,5 @@ Learn how to install, configure, and deploy NixOS.
 :glob:
 :maxdepth: 1
 
-build-and-deploy/*
-```
\ No newline at end of file
+./*
+```
diff --git a/source/tutorials/nixos/build-and-deploy/installing-nixos-on-a-raspberry-pi.md b/source/tutorials/nixos/installing-nixos-on-a-raspberry-pi.md
similarity index 100%
rename from source/tutorials/nixos/build-and-deploy/installing-nixos-on-a-raspberry-pi.md
rename to source/tutorials/nixos/installing-nixos-on-a-raspberry-pi.md
diff --git a/source/tutorials/nixos/build-and-deploy/integration-testing-using-virtual-machines.md b/source/tutorials/nixos/integration-testing-using-virtual-machines.md
similarity index 100%
rename from source/tutorials/nixos/build-and-deploy/integration-testing-using-virtual-machines.md
rename to source/tutorials/nixos/integration-testing-using-virtual-machines.md
diff --git a/source/tutorials/nixos/build-and-deploy/nixos-configuration-on-vm.md b/source/tutorials/nixos/nixos-configuration-on-vm.md
similarity index 100%
rename from source/tutorials/nixos/build-and-deploy/nixos-configuration-on-vm.md
rename to source/tutorials/nixos/nixos-configuration-on-vm.md