diff --git a/content/en/docs/03/31_cdi-introduction.md b/content/en/docs/containerized-data-importer/31_cdi-introduction.md
similarity index 100%
rename from content/en/docs/03/31_cdi-introduction.md
rename to content/en/docs/containerized-data-importer/31_cdi-introduction.md
diff --git a/content/en/docs/03/32_create-datavolume.md b/content/en/docs/containerized-data-importer/32_create-datavolume.md
similarity index 100%
rename from content/en/docs/03/32_create-datavolume.md
rename to content/en/docs/containerized-data-importer/32_create-datavolume.md
diff --git a/content/en/docs/03/33_apline-vm.md b/content/en/docs/containerized-data-importer/33_apline-vm.md
similarity index 100%
rename from content/en/docs/03/33_apline-vm.md
rename to content/en/docs/containerized-data-importer/33_apline-vm.md
diff --git a/content/en/docs/03/_index.md b/content/en/docs/containerized-data-importer/_index.md
similarity index 100%
rename from content/en/docs/03/_index.md
rename to content/en/docs/containerized-data-importer/_index.md
diff --git a/content/en/docs/02/21_create-vm.md b/content/en/docs/getting-started-with-kubevirt/21_create-vm.md
similarity index 100%
rename from content/en/docs/02/21_create-vm.md
rename to content/en/docs/getting-started-with-kubevirt/21_create-vm.md
diff --git a/content/en/docs/02/22_lifecycle.md b/content/en/docs/getting-started-with-kubevirt/22_lifecycle.md
similarity index 100%
rename from content/en/docs/02/22_lifecycle.md
rename to content/en/docs/getting-started-with-kubevirt/22_lifecycle.md
diff --git a/content/en/docs/02/23_console.md b/content/en/docs/getting-started-with-kubevirt/23_console.md
similarity index 100%
rename from content/en/docs/02/23_console.md
rename to content/en/docs/getting-started-with-kubevirt/23_console.md
diff --git a/content/en/docs/02/24_ssh.md b/content/en/docs/getting-started-with-kubevirt/24_ssh.md
similarity index 100%
rename from content/en/docs/02/24_ssh.md
rename to content/en/docs/getting-started-with-kubevirt/24_ssh.md
diff --git a/content/en/docs/02/25_vm-changes.md b/content/en/docs/getting-started-with-kubevirt/25_vm-changes.md
similarity index 100%
rename from content/en/docs/02/25_vm-changes.md
rename to content/en/docs/getting-started-with-kubevirt/25_vm-changes.md
diff --git a/content/en/docs/02/_index.md b/content/en/docs/getting-started-with-kubevirt/_index.md
similarity index 100%
rename from content/en/docs/02/_index.md
rename to content/en/docs/getting-started-with-kubevirt/_index.md
diff --git a/content/en/docs/02/no-bootable-device.png b/content/en/docs/getting-started-with-kubevirt/no-bootable-device.png
similarity index 100%
rename from content/en/docs/02/no-bootable-device.png
rename to content/en/docs/getting-started-with-kubevirt/no-bootable-device.png
diff --git a/content/en/docs/02/vm_lifecycle_graph.png b/content/en/docs/getting-started-with-kubevirt/vm_lifecycle_graph.png
similarity index 100%
rename from content/en/docs/02/vm_lifecycle_graph.png
rename to content/en/docs/getting-started-with-kubevirt/vm_lifecycle_graph.png
diff --git a/content/en/docs/05/51_startup-introduction.md b/content/en/docs/initialize-vms-with-startup-scripts/51_startup-introduction.md
similarity index 100%
rename from content/en/docs/05/51_startup-introduction.md
rename to content/en/docs/initialize-vms-with-startup-scripts/51_startup-introduction.md
diff --git a/content/en/docs/05/52_cloud-init.md b/content/en/docs/initialize-vms-with-startup-scripts/52_cloud-init.md
similarity index 100%
rename from content/en/docs/05/52_cloud-init.md
rename to content/en/docs/initialize-vms-with-startup-scripts/52_cloud-init.md
diff --git a/content/en/docs/05/53_ignition.md b/content/en/docs/initialize-vms-with-startup-scripts/53_ignition.md
similarity index 100%
rename from content/en/docs/05/53_ignition.md
rename to content/en/docs/initialize-vms-with-startup-scripts/53_ignition.md
diff --git a/content/en/docs/05/54_sysprep.md b/content/en/docs/initialize-vms-with-startup-scripts/54_sysprep.md
similarity index 100%
rename from content/en/docs/05/54_sysprep.md
rename to content/en/docs/initialize-vms-with-startup-scripts/54_sysprep.md
diff --git a/content/en/docs/05/_index.md b/content/en/docs/initialize-vms-with-startup-scripts/_index.md
similarity index 100%
rename from content/en/docs/05/_index.md
rename to content/en/docs/initialize-vms-with-startup-scripts/_index.md
diff --git a/content/en/docs/04/41_types-introduction.md b/content/en/docs/instance-types-and-preferences/41_types-introduction.md
similarity index 100%
rename from content/en/docs/04/41_types-introduction.md
rename to content/en/docs/instance-types-and-preferences/41_types-introduction.md
diff --git a/content/en/docs/04/42_common-instancetypes.md b/content/en/docs/instance-types-and-preferences/42_common-instancetypes.md
similarity index 100%
rename from content/en/docs/04/42_common-instancetypes.md
rename to content/en/docs/instance-types-and-preferences/42_common-instancetypes.md
diff --git a/content/en/docs/04/43_create-instancetype.md b/content/en/docs/instance-types-and-preferences/43_create-instancetype.md
similarity index 100%
rename from content/en/docs/04/43_create-instancetype.md
rename to content/en/docs/instance-types-and-preferences/43_create-instancetype.md
diff --git a/content/en/docs/04/44_reassign-instancetype.md b/content/en/docs/instance-types-and-preferences/44_reassign-instancetype.md
similarity index 100%
rename from content/en/docs/04/44_reassign-instancetype.md
rename to content/en/docs/instance-types-and-preferences/44_reassign-instancetype.md
diff --git a/content/en/docs/04/_index.md b/content/en/docs/instance-types-and-preferences/_index.md
similarity index 100%
rename from content/en/docs/04/_index.md
rename to content/en/docs/instance-types-and-preferences/_index.md
diff --git a/content/en/docs/01/11_kubevirt-configuration.md b/content/en/docs/lab-environment/11_kubevirt-configuration.md
similarity index 100%
rename from content/en/docs/01/11_kubevirt-configuration.md
rename to content/en/docs/lab-environment/11_kubevirt-configuration.md
diff --git a/content/en/docs/01/_index.md b/content/en/docs/lab-environment/_index.md
similarity index 100%
rename from content/en/docs/01/_index.md
rename to content/en/docs/lab-environment/_index.md
diff --git a/content/en/docs/01/theia.png b/content/en/docs/lab-environment/theia.png
similarity index 100%
rename from content/en/docs/01/theia.png
rename to content/en/docs/lab-environment/theia.png
diff --git a/content/en/docs/06/61_vm-images.md b/content/en/docs/scaling-vms/61_vm-images.md
similarity index 100%
rename from content/en/docs/06/61_vm-images.md
rename to content/en/docs/scaling-vms/61_vm-images.md
diff --git a/content/en/docs/06/62_vm-pools.md b/content/en/docs/scaling-vms/62_vm-pools.md
similarity index 100%
rename from content/en/docs/06/62_vm-pools.md
rename to content/en/docs/scaling-vms/62_vm-pools.md
diff --git a/content/en/docs/06/63_vm-replica-sets.md b/content/en/docs/scaling-vms/63_vm-replica-sets.md
similarity index 100%
rename from content/en/docs/06/63_vm-replica-sets.md
rename to content/en/docs/scaling-vms/63_vm-replica-sets.md
diff --git a/content/en/docs/06/_index.md b/content/en/docs/scaling-vms/_index.md
similarity index 100%
rename from content/en/docs/06/_index.md
rename to content/en/docs/scaling-vms/_index.md
diff --git a/content/en/docs/07/71_mounting-storage.md b/content/en/docs/storage/71_mounting-storage.md
similarity index 100%
rename from content/en/docs/07/71_mounting-storage.md
rename to content/en/docs/storage/71_mounting-storage.md
diff --git a/content/en/docs/07/72_storageprofiles.md b/content/en/docs/storage/72_storageprofiles.md
similarity index 100%
rename from content/en/docs/07/72_storageprofiles.md
rename to content/en/docs/storage/72_storageprofiles.md
diff --git a/content/en/docs/07/73_hotplug-disks.md b/content/en/docs/storage/73_hotplug-disks.md
similarity index 100%
rename from content/en/docs/07/73_hotplug-disks.md
rename to content/en/docs/storage/73_hotplug-disks.md
diff --git a/content/en/docs/07/74_snapshot.md b/content/en/docs/storage/74_snapshot.md
similarity index 100%
rename from content/en/docs/07/74_snapshot.md
rename to content/en/docs/storage/74_snapshot.md
diff --git a/content/en/docs/07/75_resizing-disks.md b/content/en/docs/storage/75_resizing-disks.md
similarity index 100%
rename from content/en/docs/07/75_resizing-disks.md
rename to content/en/docs/storage/75_resizing-disks.md
diff --git a/content/en/docs/07/_index.md b/content/en/docs/storage/_index.md
similarity index 100%
rename from content/en/docs/07/_index.md
rename to content/en/docs/storage/_index.md
diff --git a/content/en/docs/07/virtiofs.png b/content/en/docs/storage/virtiofs.png
similarity index 100%
rename from content/en/docs/07/virtiofs.png
rename to content/en/docs/storage/virtiofs.png