diff --git a/2.ami_and_containers/containers/pytorch/0.nvcr-pytorch-aws.dockerfile b/2.ami_and_containers/2.containers/pytorch/0.nvcr-pytorch-aws.dockerfile
similarity index 100%
rename from 2.ami_and_containers/containers/pytorch/0.nvcr-pytorch-aws.dockerfile
rename to 2.ami_and_containers/2.containers/pytorch/0.nvcr-pytorch-aws.dockerfile
diff --git a/2.ami_and_containers/containers/pytorch/README.md b/2.ami_and_containers/2.containers/pytorch/README.md
similarity index 100%
rename from 2.ami_and_containers/containers/pytorch/README.md
rename to 2.ami_and_containers/2.containers/pytorch/README.md
diff --git a/3.test_cases/1.megatron-lm/0.distributed-training.Dockerfile b/3.test_cases/01.megatron-lm/0.distributed-training.Dockerfile
similarity index 100%
rename from 3.test_cases/1.megatron-lm/0.distributed-training.Dockerfile
rename to 3.test_cases/01.megatron-lm/0.distributed-training.Dockerfile
diff --git a/3.test_cases/1.megatron-lm/1.data-preprocessing.sbatch b/3.test_cases/01.megatron-lm/1.data-preprocessing.sbatch
similarity index 100%
rename from 3.test_cases/1.megatron-lm/1.data-preprocessing.sbatch
rename to 3.test_cases/01.megatron-lm/1.data-preprocessing.sbatch
diff --git a/3.test_cases/1.megatron-lm/2.distributed-training.sbatch b/3.test_cases/01.megatron-lm/2.distributed-training.sbatch
similarity index 100%
rename from 3.test_cases/1.megatron-lm/2.distributed-training.sbatch
rename to 3.test_cases/01.megatron-lm/2.distributed-training.sbatch
diff --git a/3.test_cases/1.megatron-lm/3.data-preproc-llama2.sbatch b/3.test_cases/01.megatron-lm/3.data-preproc-llama2.sbatch
similarity index 100%
rename from 3.test_cases/1.megatron-lm/3.data-preproc-llama2.sbatch
rename to 3.test_cases/01.megatron-lm/3.data-preproc-llama2.sbatch
diff --git a/3.test_cases/1.megatron-lm/4.pretrain-llama2.sbatch b/3.test_cases/01.megatron-lm/4.pretrain-llama2.sbatch
similarity index 100%
rename from 3.test_cases/1.megatron-lm/4.pretrain-llama2.sbatch
rename to 3.test_cases/01.megatron-lm/4.pretrain-llama2.sbatch
diff --git a/3.test_cases/1.megatron-lm/Makefile b/3.test_cases/01.megatron-lm/Makefile
similarity index 100%
rename from 3.test_cases/1.megatron-lm/Makefile
rename to 3.test_cases/01.megatron-lm/Makefile
diff --git a/3.test_cases/1.megatron-lm/README.md b/3.test_cases/01.megatron-lm/README.md
similarity index 100%
rename from 3.test_cases/1.megatron-lm/README.md
rename to 3.test_cases/01.megatron-lm/README.md
diff --git a/3.test_cases/1.megatron-lm/test_megatron_lm.py b/3.test_cases/01.megatron-lm/test_megatron_lm.py
similarity index 100%
rename from 3.test_cases/1.megatron-lm/test_megatron_lm.py
rename to 3.test_cases/01.megatron-lm/test_megatron_lm.py
diff --git a/3.test_cases/2.nemo-launcher/.gitignore b/3.test_cases/02.nemo-launcher/.gitignore
similarity index 100%
rename from 3.test_cases/2.nemo-launcher/.gitignore
rename to 3.test_cases/02.nemo-launcher/.gitignore
diff --git a/3.test_cases/2.nemo-launcher/0.NemoMegatron-aws-optimized.Dockerfile b/3.test_cases/02.nemo-launcher/0.NemoMegatron-aws-optimized.Dockerfile
similarity index 100%
rename from 3.test_cases/2.nemo-launcher/0.NemoMegatron-aws-optimized.Dockerfile
rename to 3.test_cases/02.nemo-launcher/0.NemoMegatron-aws-optimized.Dockerfile
diff --git a/3.test_cases/2.nemo-launcher/1.bmk-pretrain-gpt3-126m.sh b/3.test_cases/02.nemo-launcher/1.bmk-pretrain-gpt3-126m.sh
similarity index 100%
rename from 3.test_cases/2.nemo-launcher/1.bmk-pretrain-gpt3-126m.sh
rename to 3.test_cases/02.nemo-launcher/1.bmk-pretrain-gpt3-126m.sh
diff --git a/3.test_cases/2.nemo-launcher/2.bmk-pretrain-gpt3-5b.sh b/3.test_cases/02.nemo-launcher/2.bmk-pretrain-gpt3-5b.sh
similarity index 100%
rename from 3.test_cases/2.nemo-launcher/2.bmk-pretrain-gpt3-5b.sh
rename to 3.test_cases/02.nemo-launcher/2.bmk-pretrain-gpt3-5b.sh
diff --git a/3.test_cases/2.nemo-launcher/3.bmk-pretrain-gpt3-40b.sh b/3.test_cases/02.nemo-launcher/3.bmk-pretrain-gpt3-40b.sh
similarity index 100%
rename from 3.test_cases/2.nemo-launcher/3.bmk-pretrain-gpt3-40b.sh
rename to 3.test_cases/02.nemo-launcher/3.bmk-pretrain-gpt3-40b.sh
diff --git a/3.test_cases/2.nemo-launcher/4.bmk-pretrain-gpt3-175b.sh b/3.test_cases/02.nemo-launcher/4.bmk-pretrain-gpt3-175b.sh
similarity index 100%
rename from 3.test_cases/2.nemo-launcher/4.bmk-pretrain-gpt3-175b.sh
rename to 3.test_cases/02.nemo-launcher/4.bmk-pretrain-gpt3-175b.sh
diff --git a/3.test_cases/2.nemo-launcher/5.bmk-pretrain-llama-7b.sh b/3.test_cases/02.nemo-launcher/5.bmk-pretrain-llama-7b.sh
similarity index 100%
rename from 3.test_cases/2.nemo-launcher/5.bmk-pretrain-llama-7b.sh
rename to 3.test_cases/02.nemo-launcher/5.bmk-pretrain-llama-7b.sh
diff --git a/3.test_cases/2.nemo-launcher/6.bmk-pretrain-llama-70b.sh b/3.test_cases/02.nemo-launcher/6.bmk-pretrain-llama-70b.sh
similarity index 100%
rename from 3.test_cases/2.nemo-launcher/6.bmk-pretrain-llama-70b.sh
rename to 3.test_cases/02.nemo-launcher/6.bmk-pretrain-llama-70b.sh
diff --git a/3.test_cases/2.nemo-launcher/README.md b/3.test_cases/02.nemo-launcher/README.md
similarity index 100%
rename from 3.test_cases/2.nemo-launcher/README.md
rename to 3.test_cases/02.nemo-launcher/README.md
diff --git a/3.test_cases/2.nemo-launcher/conf.template/cluster/bcm.yaml b/3.test_cases/02.nemo-launcher/conf.template/cluster/bcm.yaml
similarity index 100%
rename from 3.test_cases/2.nemo-launcher/conf.template/cluster/bcm.yaml
rename to 3.test_cases/02.nemo-launcher/conf.template/cluster/bcm.yaml
diff --git a/3.test_cases/2.nemo-launcher/conf.template/config.yaml b/3.test_cases/02.nemo-launcher/conf.template/config.yaml
similarity index 100%
rename from 3.test_cases/2.nemo-launcher/conf.template/config.yaml
rename to 3.test_cases/02.nemo-launcher/conf.template/config.yaml
diff --git a/3.test_cases/2.nemo-launcher/test_nemo_launcher.py b/3.test_cases/02.nemo-launcher/test_nemo_launcher.py
similarity index 100%
rename from 3.test_cases/2.nemo-launcher/test_nemo_launcher.py
rename to 3.test_cases/02.nemo-launcher/test_nemo_launcher.py
diff --git a/3.test_cases/3.MPT/0.llm-foundry.Dockerfile b/3.test_cases/03.MPT/0.llm-foundry.Dockerfile
similarity index 100%
rename from 3.test_cases/3.MPT/0.llm-foundry.Dockerfile
rename to 3.test_cases/03.MPT/0.llm-foundry.Dockerfile
diff --git a/3.test_cases/3.MPT/1.c4-preprocess.sbatch b/3.test_cases/03.MPT/1.c4-preprocess.sbatch
similarity index 100%
rename from 3.test_cases/3.MPT/1.c4-preprocess.sbatch
rename to 3.test_cases/03.MPT/1.c4-preprocess.sbatch
diff --git a/3.test_cases/3.MPT/2.train-mpt-manual-distributed.sbatch b/3.test_cases/03.MPT/2.train-mpt-manual-distributed.sbatch
similarity index 100%
rename from 3.test_cases/3.MPT/2.train-mpt-manual-distributed.sbatch
rename to 3.test_cases/03.MPT/2.train-mpt-manual-distributed.sbatch
diff --git a/3.test_cases/3.MPT/Makefile b/3.test_cases/03.MPT/Makefile
similarity index 100%
rename from 3.test_cases/3.MPT/Makefile
rename to 3.test_cases/03.MPT/Makefile
diff --git a/3.test_cases/3.MPT/README.md b/3.test_cases/03.MPT/README.md
similarity index 100%
rename from 3.test_cases/3.MPT/README.md
rename to 3.test_cases/03.MPT/README.md
diff --git a/3.test_cases/4.DDP/1-create_environment.sh b/3.test_cases/04.DDP/1-create_environment.sh
similarity index 100%
rename from 3.test_cases/4.DDP/1-create_environment.sh
rename to 3.test_cases/04.DDP/1-create_environment.sh
diff --git a/3.test_cases/4.DDP/2-calc_mean_std.slurm b/3.test_cases/04.DDP/2-calc_mean_std.slurm
similarity index 100%
rename from 3.test_cases/4.DDP/2-calc_mean_std.slurm
rename to 3.test_cases/04.DDP/2-calc_mean_std.slurm
diff --git a/3.test_cases/4.DDP/3-main_dino.slurm b/3.test_cases/04.DDP/3-main_dino.slurm
similarity index 100%
rename from 3.test_cases/4.DDP/3-main_dino.slurm
rename to 3.test_cases/04.DDP/3-main_dino.slurm
diff --git a/3.test_cases/4.DDP/4-compute_cls_features.slurm b/3.test_cases/04.DDP/4-compute_cls_features.slurm
similarity index 100%
rename from 3.test_cases/4.DDP/4-compute_cls_features.slurm
rename to 3.test_cases/04.DDP/4-compute_cls_features.slurm
diff --git a/3.test_cases/4.DDP/5-extract_labels.slurm b/3.test_cases/04.DDP/5-extract_labels.slurm
similarity index 100%
rename from 3.test_cases/4.DDP/5-extract_labels.slurm
rename to 3.test_cases/04.DDP/5-extract_labels.slurm
diff --git a/3.test_cases/4.DDP/6-global_knn.slurm b/3.test_cases/04.DDP/6-global_knn.slurm
similarity index 100%
rename from 3.test_cases/4.DDP/6-global_knn.slurm
rename to 3.test_cases/04.DDP/6-global_knn.slurm
diff --git a/3.test_cases/4.DDP/7-plots.slurm b/3.test_cases/04.DDP/7-plots.slurm
similarity index 100%
rename from 3.test_cases/4.DDP/7-plots.slurm
rename to 3.test_cases/04.DDP/7-plots.slurm
diff --git a/3.test_cases/4.DDP/README.md b/3.test_cases/04.DDP/README.md
similarity index 100%
rename from 3.test_cases/4.DDP/README.md
rename to 3.test_cases/04.DDP/README.md
diff --git a/3.test_cases/4.DDP/images/Architecture.png b/3.test_cases/04.DDP/images/Architecture.png
similarity index 100%
rename from 3.test_cases/4.DDP/images/Architecture.png
rename to 3.test_cases/04.DDP/images/Architecture.png
diff --git a/3.test_cases/4.DDP/images/Test-dir.png b/3.test_cases/04.DDP/images/Test-dir.png
similarity index 100%
rename from 3.test_cases/4.DDP/images/Test-dir.png
rename to 3.test_cases/04.DDP/images/Test-dir.png
diff --git a/3.test_cases/4.DDP/images/Training-dir.png b/3.test_cases/04.DDP/images/Training-dir.png
similarity index 100%
rename from 3.test_cases/4.DDP/images/Training-dir.png
rename to 3.test_cases/04.DDP/images/Training-dir.png
diff --git a/3.test_cases/4.DDP/images/fsx.png b/3.test_cases/04.DDP/images/fsx.png
similarity index 100%
rename from 3.test_cases/4.DDP/images/fsx.png
rename to 3.test_cases/04.DDP/images/fsx.png
diff --git a/3.test_cases/4.DDP/images/list-clusters.png b/3.test_cases/04.DDP/images/list-clusters.png
similarity index 100%
rename from 3.test_cases/4.DDP/images/list-clusters.png
rename to 3.test_cases/04.DDP/images/list-clusters.png
diff --git a/3.test_cases/4.DDP/images/sinfo.png b/3.test_cases/04.DDP/images/sinfo.png
similarity index 100%
rename from 3.test_cases/4.DDP/images/sinfo.png
rename to 3.test_cases/04.DDP/images/sinfo.png
diff --git a/3.test_cases/4.DDP/images/vpc.png b/3.test_cases/04.DDP/images/vpc.png
similarity index 100%
rename from 3.test_cases/4.DDP/images/vpc.png
rename to 3.test_cases/04.DDP/images/vpc.png
diff --git a/3.test_cases/4.DDP/pyscripts/compute_CLS_features.py b/3.test_cases/04.DDP/pyscripts/compute_CLS_features.py
similarity index 100%
rename from 3.test_cases/4.DDP/pyscripts/compute_CLS_features.py
rename to 3.test_cases/04.DDP/pyscripts/compute_CLS_features.py
diff --git a/3.test_cases/4.DDP/pyscripts/extract_image_labels.py b/3.test_cases/04.DDP/pyscripts/extract_image_labels.py
similarity index 100%
rename from 3.test_cases/4.DDP/pyscripts/extract_image_labels.py
rename to 3.test_cases/04.DDP/pyscripts/extract_image_labels.py
diff --git a/3.test_cases/4.DDP/pyscripts/global_kNN.py b/3.test_cases/04.DDP/pyscripts/global_kNN.py
similarity index 100%
rename from 3.test_cases/4.DDP/pyscripts/global_kNN.py
rename to 3.test_cases/04.DDP/pyscripts/global_kNN.py
diff --git a/3.test_cases/4.DDP/pyscripts/main_dino.py b/3.test_cases/04.DDP/pyscripts/main_dino.py
similarity index 100%
rename from 3.test_cases/4.DDP/pyscripts/main_dino.py
rename to 3.test_cases/04.DDP/pyscripts/main_dino.py
diff --git a/3.test_cases/4.DDP/pyscripts/mean_std_dataset.py b/3.test_cases/04.DDP/pyscripts/mean_std_dataset.py
similarity index 100%
rename from 3.test_cases/4.DDP/pyscripts/mean_std_dataset.py
rename to 3.test_cases/04.DDP/pyscripts/mean_std_dataset.py
diff --git a/3.test_cases/4.DDP/pyscripts/plot_in_2D.py b/3.test_cases/04.DDP/pyscripts/plot_in_2D.py
similarity index 100%
rename from 3.test_cases/4.DDP/pyscripts/plot_in_2D.py
rename to 3.test_cases/04.DDP/pyscripts/plot_in_2D.py
diff --git a/3.test_cases/4.DDP/pyscripts/setup.py b/3.test_cases/04.DDP/pyscripts/setup.py
similarity index 100%
rename from 3.test_cases/4.DDP/pyscripts/setup.py
rename to 3.test_cases/04.DDP/pyscripts/setup.py
diff --git a/3.test_cases/4.DDP/pyscripts/utils.py b/3.test_cases/04.DDP/pyscripts/utils.py
similarity index 100%
rename from 3.test_cases/4.DDP/pyscripts/utils.py
rename to 3.test_cases/04.DDP/pyscripts/utils.py
diff --git a/3.test_cases/4.DDP/pyscripts/vision_transformer.py b/3.test_cases/04.DDP/pyscripts/vision_transformer.py
similarity index 100%
rename from 3.test_cases/4.DDP/pyscripts/vision_transformer.py
rename to 3.test_cases/04.DDP/pyscripts/vision_transformer.py
diff --git a/3.test_cases/4.DDP/pyscripts/visualise_attention.py b/3.test_cases/04.DDP/pyscripts/visualise_attention.py
similarity index 100%
rename from 3.test_cases/4.DDP/pyscripts/visualise_attention.py
rename to 3.test_cases/04.DDP/pyscripts/visualise_attention.py
diff --git a/3.test_cases/4.DDP/requirements.txt b/3.test_cases/04.DDP/requirements.txt
similarity index 100%
rename from 3.test_cases/4.DDP/requirements.txt
rename to 3.test_cases/04.DDP/requirements.txt
diff --git a/3.test_cases/4.DDP/scDINO_full_pipeline.yaml b/3.test_cases/04.DDP/scDINO_full_pipeline.yaml
similarity index 100%
rename from 3.test_cases/4.DDP/scDINO_full_pipeline.yaml
rename to 3.test_cases/04.DDP/scDINO_full_pipeline.yaml
diff --git a/3.test_cases/5.param-benchmark/0.param-benchmark.Dockerfile b/3.test_cases/05.param-benchmark/0.param-benchmark.Dockerfile
similarity index 100%
rename from 3.test_cases/5.param-benchmark/0.param-benchmark.Dockerfile
rename to 3.test_cases/05.param-benchmark/0.param-benchmark.Dockerfile
diff --git a/3.test_cases/5.param-benchmark/1.param-benchmark-comms.sbatch b/3.test_cases/05.param-benchmark/1.param-benchmark-comms.sbatch
similarity index 100%
rename from 3.test_cases/5.param-benchmark/1.param-benchmark-comms.sbatch
rename to 3.test_cases/05.param-benchmark/1.param-benchmark-comms.sbatch
diff --git a/3.test_cases/5.param-benchmark/2.param-benchmark-compute.sbatch b/3.test_cases/05.param-benchmark/2.param-benchmark-compute.sbatch
similarity index 100%
rename from 3.test_cases/5.param-benchmark/2.param-benchmark-compute.sbatch
rename to 3.test_cases/05.param-benchmark/2.param-benchmark-compute.sbatch
diff --git a/3.test_cases/5.param-benchmark/README.md b/3.test_cases/05.param-benchmark/README.md
similarity index 100%
rename from 3.test_cases/5.param-benchmark/README.md
rename to 3.test_cases/05.param-benchmark/README.md
diff --git a/3.test_cases/6.stable-diffusion/README.md b/3.test_cases/06.stable-diffusion/README.md
similarity index 100%
rename from 3.test_cases/6.stable-diffusion/README.md
rename to 3.test_cases/06.stable-diffusion/README.md
diff --git a/3.test_cases/6.stable-diffusion/multi-node/1.Dockerfile b/3.test_cases/06.stable-diffusion/multi-node/1.Dockerfile
similarity index 100%
rename from 3.test_cases/6.stable-diffusion/multi-node/1.Dockerfile
rename to 3.test_cases/06.stable-diffusion/multi-node/1.Dockerfile
diff --git a/3.test_cases/6.stable-diffusion/multi-node/2.train.sbatch b/3.test_cases/06.stable-diffusion/multi-node/2.train.sbatch
similarity index 100%
rename from 3.test_cases/6.stable-diffusion/multi-node/2.train.sbatch
rename to 3.test_cases/06.stable-diffusion/multi-node/2.train.sbatch
diff --git a/3.test_cases/6.stable-diffusion/multi-node/3.stable-diffusion-eks.yaml-template b/3.test_cases/06.stable-diffusion/multi-node/3.stable-diffusion-eks.yaml-template
similarity index 100%
rename from 3.test_cases/6.stable-diffusion/multi-node/3.stable-diffusion-eks.yaml-template
rename to 3.test_cases/06.stable-diffusion/multi-node/3.stable-diffusion-eks.yaml-template
diff --git a/3.test_cases/6.stable-diffusion/multi-node/4.etcd.yaml b/3.test_cases/06.stable-diffusion/multi-node/4.etcd.yaml
similarity index 100%
rename from 3.test_cases/6.stable-diffusion/multi-node/4.etcd.yaml
rename to 3.test_cases/06.stable-diffusion/multi-node/4.etcd.yaml
diff --git a/3.test_cases/6.stable-diffusion/multi-node/p5-model-scaling-stable-diff-throughput.png b/3.test_cases/06.stable-diffusion/multi-node/p5-model-scaling-stable-diff-throughput.png
similarity index 100%
rename from 3.test_cases/6.stable-diffusion/multi-node/p5-model-scaling-stable-diff-throughput.png
rename to 3.test_cases/06.stable-diffusion/multi-node/p5-model-scaling-stable-diff-throughput.png
diff --git a/3.test_cases/6.stable-diffusion/multi-node/p5-model-scaling-stable-diff.png b/3.test_cases/06.stable-diffusion/multi-node/p5-model-scaling-stable-diff.png
similarity index 100%
rename from 3.test_cases/6.stable-diffusion/multi-node/p5-model-scaling-stable-diff.png
rename to 3.test_cases/06.stable-diffusion/multi-node/p5-model-scaling-stable-diff.png
diff --git a/3.test_cases/6.stable-diffusion/single-node/0.Dockerfile b/3.test_cases/06.stable-diffusion/single-node/0.Dockerfile
similarity index 100%
rename from 3.test_cases/6.stable-diffusion/single-node/0.Dockerfile
rename to 3.test_cases/06.stable-diffusion/single-node/0.Dockerfile
diff --git a/3.test_cases/6.stable-diffusion/single-node/calculate_number_of_parameters.py b/3.test_cases/06.stable-diffusion/single-node/calculate_number_of_parameters.py
similarity index 100%
rename from 3.test_cases/6.stable-diffusion/single-node/calculate_number_of_parameters.py
rename to 3.test_cases/06.stable-diffusion/single-node/calculate_number_of_parameters.py
diff --git a/3.test_cases/6.stable-diffusion/single-node/sd_p4de_p5.png b/3.test_cases/06.stable-diffusion/single-node/sd_p4de_p5.png
similarity index 100%
rename from 3.test_cases/6.stable-diffusion/single-node/sd_p4de_p5.png
rename to 3.test_cases/06.stable-diffusion/single-node/sd_p4de_p5.png
diff --git a/3.test_cases/7.tensorflow-distributed/0.tensorflow.Dockerfile b/3.test_cases/07.tensorflow-distributed/0.tensorflow.Dockerfile
similarity index 100%
rename from 3.test_cases/7.tensorflow-distributed/0.tensorflow.Dockerfile
rename to 3.test_cases/07.tensorflow-distributed/0.tensorflow.Dockerfile
diff --git a/3.test_cases/7.tensorflow-distributed/1.run-training.sbatch b/3.test_cases/07.tensorflow-distributed/1.run-training.sbatch
similarity index 100%
rename from 3.test_cases/7.tensorflow-distributed/1.run-training.sbatch
rename to 3.test_cases/07.tensorflow-distributed/1.run-training.sbatch
diff --git a/3.test_cases/7.tensorflow-distributed/Makefile b/3.test_cases/07.tensorflow-distributed/Makefile
similarity index 100%
rename from 3.test_cases/7.tensorflow-distributed/Makefile
rename to 3.test_cases/07.tensorflow-distributed/Makefile
diff --git a/3.test_cases/7.tensorflow-distributed/README.md b/3.test_cases/07.tensorflow-distributed/README.md
similarity index 100%
rename from 3.test_cases/7.tensorflow-distributed/README.md
rename to 3.test_cases/07.tensorflow-distributed/README.md
diff --git a/3.test_cases/7.tensorflow-distributed/src/worker.py b/3.test_cases/07.tensorflow-distributed/src/worker.py
similarity index 100%
rename from 3.test_cases/7.tensorflow-distributed/src/worker.py
rename to 3.test_cases/07.tensorflow-distributed/src/worker.py
diff --git a/3.test_cases/8.neuronx-nemo-megatron/1.setup-venv.sh b/3.test_cases/08.neuronx-nemo-megatron/1.setup-venv.sh
similarity index 100%
rename from 3.test_cases/8.neuronx-nemo-megatron/1.setup-venv.sh
rename to 3.test_cases/08.neuronx-nemo-megatron/1.setup-venv.sh
diff --git a/3.test_cases/8.neuronx-nemo-megatron/2.setup-neuronx-nemo-megatron.sh b/3.test_cases/08.neuronx-nemo-megatron/2.setup-neuronx-nemo-megatron.sh
similarity index 100%
rename from 3.test_cases/8.neuronx-nemo-megatron/2.setup-neuronx-nemo-megatron.sh
rename to 3.test_cases/08.neuronx-nemo-megatron/2.setup-neuronx-nemo-megatron.sh
diff --git a/3.test_cases/8.neuronx-nemo-megatron/3.convert-weight.sbatch b/3.test_cases/08.neuronx-nemo-megatron/3.convert-weight.sbatch
similarity index 100%
rename from 3.test_cases/8.neuronx-nemo-megatron/3.convert-weight.sbatch
rename to 3.test_cases/08.neuronx-nemo-megatron/3.convert-weight.sbatch
diff --git a/3.test_cases/8.neuronx-nemo-megatron/4.tokenize.sbatch b/3.test_cases/08.neuronx-nemo-megatron/4.tokenize.sbatch
similarity index 100%
rename from 3.test_cases/8.neuronx-nemo-megatron/4.tokenize.sbatch
rename to 3.test_cases/08.neuronx-nemo-megatron/4.tokenize.sbatch
diff --git a/3.test_cases/8.neuronx-nemo-megatron/5.precompile-model.sh b/3.test_cases/08.neuronx-nemo-megatron/5.precompile-model.sh
similarity index 100%
rename from 3.test_cases/8.neuronx-nemo-megatron/5.precompile-model.sh
rename to 3.test_cases/08.neuronx-nemo-megatron/5.precompile-model.sh
diff --git a/3.test_cases/8.neuronx-nemo-megatron/6.pretrain-model.sh b/3.test_cases/08.neuronx-nemo-megatron/6.pretrain-model.sh
similarity index 100%
rename from 3.test_cases/8.neuronx-nemo-megatron/6.pretrain-model.sh
rename to 3.test_cases/08.neuronx-nemo-megatron/6.pretrain-model.sh
diff --git a/3.test_cases/8.neuronx-nemo-megatron/README.md b/3.test_cases/08.neuronx-nemo-megatron/README.md
similarity index 100%
rename from 3.test_cases/8.neuronx-nemo-megatron/README.md
rename to 3.test_cases/08.neuronx-nemo-megatron/README.md
diff --git a/3.test_cases/9.nemo-multimodal/0.Dockerfile b/3.test_cases/09.nemo-multimodal/0.Dockerfile
similarity index 100%
rename from 3.test_cases/9.nemo-multimodal/0.Dockerfile
rename to 3.test_cases/09.nemo-multimodal/0.Dockerfile
diff --git a/3.test_cases/9.nemo-multimodal/README.md b/3.test_cases/09.nemo-multimodal/README.md
similarity index 100%
rename from 3.test_cases/9.nemo-multimodal/README.md
rename to 3.test_cases/09.nemo-multimodal/README.md
diff --git a/3.test_cases/9.nemo-multimodal/nemo_configs/1.config.yaml b/3.test_cases/09.nemo-multimodal/nemo_configs/1.config.yaml
similarity index 100%
rename from 3.test_cases/9.nemo-multimodal/nemo_configs/1.config.yaml
rename to 3.test_cases/09.nemo-multimodal/nemo_configs/1.config.yaml
diff --git a/3.test_cases/9.nemo-multimodal/nemo_configs/2.bcm.yaml b/3.test_cases/09.nemo-multimodal/nemo_configs/2.bcm.yaml
similarity index 100%
rename from 3.test_cases/9.nemo-multimodal/nemo_configs/2.bcm.yaml
rename to 3.test_cases/09.nemo-multimodal/nemo_configs/2.bcm.yaml
diff --git a/3.test_cases/9.nemo-multimodal/nemo_configs/3.download_multimodal.yaml b/3.test_cases/09.nemo-multimodal/nemo_configs/3.download_multimodal.yaml
similarity index 100%
rename from 3.test_cases/9.nemo-multimodal/nemo_configs/3.download_multimodal.yaml
rename to 3.test_cases/09.nemo-multimodal/nemo_configs/3.download_multimodal.yaml
diff --git a/3.test_cases/9.nemo-multimodal/nemo_configs/4.stable_diffusion_860m_res_256_pretrain_hydra.yaml b/3.test_cases/09.nemo-multimodal/nemo_configs/4.stable_diffusion_860m_res_256_pretrain_hydra.yaml
similarity index 100%
rename from 3.test_cases/9.nemo-multimodal/nemo_configs/4.stable_diffusion_860m_res_256_pretrain_hydra.yaml
rename to 3.test_cases/09.nemo-multimodal/nemo_configs/4.stable_diffusion_860m_res_256_pretrain_hydra.yaml
diff --git a/3.test_cases/9.nemo-multimodal/requirements.txt b/3.test_cases/09.nemo-multimodal/requirements.txt
similarity index 100%
rename from 3.test_cases/9.nemo-multimodal/requirements.txt
rename to 3.test_cases/09.nemo-multimodal/requirements.txt
diff --git a/3.test_cases/jax/README.md b/3.test_cases/14.JAX/README.md
similarity index 100%
rename from 3.test_cases/jax/README.md
rename to 3.test_cases/14.JAX/README.md
diff --git a/3.test_cases/jax/jax.sbatch b/3.test_cases/14.JAX/jax.sbatch
similarity index 100%
rename from 3.test_cases/jax/jax.sbatch
rename to 3.test_cases/14.JAX/jax.sbatch
diff --git a/3.test_cases/jax/jax_paxml.Dockerfile b/3.test_cases/14.JAX/jax_paxml.Dockerfile
similarity index 100%
rename from 3.test_cases/jax/jax_paxml.Dockerfile
rename to 3.test_cases/14.JAX/jax_paxml.Dockerfile
diff --git a/3.test_cases/jax/run_paxml.sh b/3.test_cases/14.JAX/run_paxml.sh
similarity index 100%
rename from 3.test_cases/jax/run_paxml.sh
rename to 3.test_cases/14.JAX/run_paxml.sh
diff --git a/3.test_cases/4.DDP/pyscripts/__pycache__/utils.cpython-38.pyc b/3.test_cases/4.DDP/pyscripts/__pycache__/utils.cpython-38.pyc
deleted file mode 100644
index 4807b196..00000000
Binary files a/3.test_cases/4.DDP/pyscripts/__pycache__/utils.cpython-38.pyc and /dev/null differ
diff --git a/3.test_cases/4.DDP/pyscripts/__pycache__/vision_transformer.cpython-38.pyc b/3.test_cases/4.DDP/pyscripts/__pycache__/vision_transformer.cpython-38.pyc
deleted file mode 100644
index c2ca12c2..00000000
Binary files a/3.test_cases/4.DDP/pyscripts/__pycache__/vision_transformer.cpython-38.pyc and /dev/null differ
diff --git a/1.architectures/efa-cheatsheet.md b/5.best_practices/efa-cheatsheet.md
similarity index 100%
rename from 1.architectures/efa-cheatsheet.md
rename to 5.best_practices/efa-cheatsheet.md
diff --git a/4.validation_and_observability/efa-versions.sh b/5.best_practices/efa-versions.sh
similarity index 100%
rename from 4.validation_and_observability/efa-versions.sh
rename to 5.best_practices/efa-versions.sh