diff --git a/tests/module_01/run_all_tests.py b/tests/01_tensor/run_all_tests.py
similarity index 100%
rename from tests/module_01/run_all_tests.py
rename to tests/01_tensor/run_all_tests.py
diff --git a/tests/module_01/test_progressive_integration.py b/tests/01_tensor/test_progressive_integration.py
similarity index 100%
rename from tests/module_01/test_progressive_integration.py
rename to tests/01_tensor/test_progressive_integration.py
diff --git a/tests/module_01/test_tensor_core.py b/tests/01_tensor/test_tensor_core.py
similarity index 100%
rename from tests/module_01/test_tensor_core.py
rename to tests/01_tensor/test_tensor_core.py
diff --git a/tests/module_01/test_tensor_integration.py b/tests/01_tensor/test_tensor_integration.py
similarity index 100%
rename from tests/module_01/test_tensor_integration.py
rename to tests/01_tensor/test_tensor_integration.py
diff --git a/tests/module_02/run_all_tests.py b/tests/02_activations/run_all_tests.py
similarity index 100%
rename from tests/module_02/run_all_tests.py
rename to tests/02_activations/run_all_tests.py
diff --git a/tests/module_02/test_activations_core.py b/tests/02_activations/test_activations_core.py
similarity index 100%
rename from tests/module_02/test_activations_core.py
rename to tests/02_activations/test_activations_core.py
diff --git a/tests/module_02/test_activations_integration.py b/tests/02_activations/test_activations_integration.py
similarity index 100%
rename from tests/module_02/test_activations_integration.py
rename to tests/02_activations/test_activations_integration.py
diff --git a/tests/module_02/test_progressive_integration.py b/tests/02_activations/test_progressive_integration.py
similarity index 100%
rename from tests/module_02/test_progressive_integration.py
rename to tests/02_activations/test_progressive_integration.py
diff --git a/tests/module_02/test_tensor_activations_integration.py b/tests/02_activations/test_tensor_activations_integration.py
similarity index 100%
rename from tests/module_02/test_tensor_activations_integration.py
rename to tests/02_activations/test_tensor_activations_integration.py
diff --git a/tests/module_03/run_all_tests.py b/tests/03_layers/run_all_tests.py
similarity index 100%
rename from tests/module_03/run_all_tests.py
rename to tests/03_layers/run_all_tests.py
diff --git a/tests/module_03/test_layers_core.py b/tests/03_layers/test_layers_core.py
similarity index 100%
rename from tests/module_03/test_layers_core.py
rename to tests/03_layers/test_layers_core.py
diff --git a/tests/module_03/test_layers_integration.py b/tests/03_layers/test_layers_integration.py
similarity index 100%
rename from tests/module_03/test_layers_integration.py
rename to tests/03_layers/test_layers_integration.py
diff --git a/tests/module_03/test_layers_networks_integration.py b/tests/03_layers/test_layers_networks_integration.py
similarity index 100%
rename from tests/module_03/test_layers_networks_integration.py
rename to tests/03_layers/test_layers_networks_integration.py
diff --git a/tests/module_03/test_progressive_integration.py b/tests/03_layers/test_progressive_integration.py
similarity index 100%
rename from tests/module_03/test_progressive_integration.py
rename to tests/03_layers/test_progressive_integration.py
diff --git a/tests/module_04/run_all_tests.py b/tests/04_losses/run_all_tests.py
similarity index 100%
rename from tests/module_04/run_all_tests.py
rename to tests/04_losses/run_all_tests.py
diff --git a/tests/module_04/test_dense_integration.py b/tests/04_losses/test_dense_integration.py
similarity index 100%
rename from tests/module_04/test_dense_integration.py
rename to tests/04_losses/test_dense_integration.py
diff --git a/tests/module_04/test_dense_layer.py b/tests/04_losses/test_dense_layer.py
similarity index 100%
rename from tests/module_04/test_dense_layer.py
rename to tests/04_losses/test_dense_layer.py
diff --git a/tests/module_04/test_network_capability.py b/tests/04_losses/test_network_capability.py
similarity index 100%
rename from tests/module_04/test_network_capability.py
rename to tests/04_losses/test_network_capability.py
diff --git a/tests/module_04/test_progressive_integration.py b/tests/04_losses/test_progressive_integration.py
similarity index 100%
rename from tests/module_04/test_progressive_integration.py
rename to tests/04_losses/test_progressive_integration.py
diff --git a/tests/module_05/run_all_tests.py b/tests/05_autograd/run_all_tests.py
similarity index 100%
rename from tests/module_05/run_all_tests.py
rename to tests/05_autograd/run_all_tests.py
diff --git a/tests/module_05/test_dataloader_tensor_integration.py b/tests/05_autograd/test_dataloader_tensor_integration.py
similarity index 100%
rename from tests/module_05/test_dataloader_tensor_integration.py
rename to tests/05_autograd/test_dataloader_tensor_integration.py
diff --git a/tests/module_05/test_progressive_integration.py b/tests/05_autograd/test_progressive_integration.py
similarity index 100%
rename from tests/module_05/test_progressive_integration.py
rename to tests/05_autograd/test_progressive_integration.py
diff --git a/tests/module_06/run_all_tests.py b/tests/06_optimizers/run_all_tests.py
similarity index 100%
rename from tests/module_06/run_all_tests.py
rename to tests/06_optimizers/run_all_tests.py
diff --git a/tests/module_06/test_cnn_networks_integration.py b/tests/06_optimizers/test_cnn_networks_integration.py
similarity index 100%
rename from tests/module_06/test_cnn_networks_integration.py
rename to tests/06_optimizers/test_cnn_networks_integration.py
diff --git a/tests/module_06/test_cnn_pipeline_integration.py b/tests/06_optimizers/test_cnn_pipeline_integration.py
similarity index 100%
rename from tests/module_06/test_cnn_pipeline_integration.py
rename to tests/06_optimizers/test_cnn_pipeline_integration.py
diff --git a/tests/module_06/test_progressive_integration.py b/tests/06_optimizers/test_progressive_integration.py
similarity index 100%
rename from tests/module_06/test_progressive_integration.py
rename to tests/06_optimizers/test_progressive_integration.py
diff --git a/tests/module_06/test_spatial_core.py b/tests/06_optimizers/test_spatial_core.py
similarity index 100%
rename from tests/module_06/test_spatial_core.py
rename to tests/06_optimizers/test_spatial_core.py
diff --git a/tests/module_06/test_tensor_cnn_integration.py b/tests/06_optimizers/test_tensor_cnn_integration.py
similarity index 100%
rename from tests/module_06/test_tensor_cnn_integration.py
rename to tests/06_optimizers/test_tensor_cnn_integration.py
diff --git a/tests/module_07/run_all_tests.py b/tests/07_training/run_all_tests.py
similarity index 100%
rename from tests/module_07/run_all_tests.py
rename to tests/07_training/run_all_tests.py
diff --git a/tests/module_07/test_autograd_integration.py b/tests/07_training/test_autograd_integration.py
similarity index 100%
rename from tests/module_07/test_autograd_integration.py
rename to tests/07_training/test_autograd_integration.py
diff --git a/tests/module_07/test_progressive_integration.py b/tests/07_training/test_progressive_integration.py
similarity index 100%
rename from tests/module_07/test_progressive_integration.py
rename to tests/07_training/test_progressive_integration.py
diff --git a/tests/module_07/test_tensor_autograd_integration.py b/tests/07_training/test_tensor_autograd_integration.py
similarity index 100%
rename from tests/module_07/test_tensor_autograd_integration.py
rename to tests/07_training/test_tensor_autograd_integration.py
diff --git a/tests/module_08/run_all_tests.py b/tests/08_dataloader/run_all_tests.py
similarity index 100%
rename from tests/module_08/run_all_tests.py
rename to tests/08_dataloader/run_all_tests.py
diff --git a/tests/module_08/test_autograd_core.py b/tests/08_dataloader/test_autograd_core.py
similarity index 100%
rename from tests/module_08/test_autograd_core.py
rename to tests/08_dataloader/test_autograd_core.py
diff --git a/tests/module_08/test_progressive_integration.py b/tests/08_dataloader/test_progressive_integration.py
similarity index 100%
rename from tests/module_08/test_progressive_integration.py
rename to tests/08_dataloader/test_progressive_integration.py
diff --git a/tests/module_09/run_all_tests.py b/tests/09_spatial/run_all_tests.py
similarity index 100%
rename from tests/module_09/run_all_tests.py
rename to tests/09_spatial/run_all_tests.py
diff --git a/tests/module_09/test_attention_pipeline_integration.py b/tests/09_spatial/test_attention_pipeline_integration.py
similarity index 100%
rename from tests/module_09/test_attention_pipeline_integration.py
rename to tests/09_spatial/test_attention_pipeline_integration.py
diff --git a/tests/module_09/test_progressive_integration.py b/tests/09_spatial/test_progressive_integration.py
similarity index 100%
rename from tests/module_09/test_progressive_integration.py
rename to tests/09_spatial/test_progressive_integration.py
diff --git a/tests/module_09/test_tensor_attention_integration.py b/tests/09_spatial/test_tensor_attention_integration.py
similarity index 100%
rename from tests/module_09/test_tensor_attention_integration.py
rename to tests/09_spatial/test_tensor_attention_integration.py
diff --git a/tests/module_10/run_all_tests.py b/tests/10_tokenization/run_all_tests.py
similarity index 100%
rename from tests/module_10/run_all_tests.py
rename to tests/10_tokenization/run_all_tests.py
diff --git a/tests/module_10/test_progressive_integration.py b/tests/10_tokenization/test_progressive_integration.py
similarity index 100%
rename from tests/module_10/test_progressive_integration.py
rename to tests/10_tokenization/test_progressive_integration.py
diff --git a/tests/module_11/run_all_tests.py b/tests/11_embeddings/run_all_tests.py
similarity index 100%
rename from tests/module_11/run_all_tests.py
rename to tests/11_embeddings/run_all_tests.py
diff --git a/tests/module_11/test_ml_pipeline.py b/tests/11_embeddings/test_ml_pipeline.py
similarity index 100%
rename from tests/module_11/test_ml_pipeline.py
rename to tests/11_embeddings/test_ml_pipeline.py
diff --git a/tests/module_11/test_progressive_integration.py b/tests/11_embeddings/test_progressive_integration.py
similarity index 100%
rename from tests/module_11/test_progressive_integration.py
rename to tests/11_embeddings/test_progressive_integration.py
diff --git a/tests/module_11/test_training_integration.py b/tests/11_embeddings/test_training_integration.py
similarity index 100%
rename from tests/module_11/test_training_integration.py
rename to tests/11_embeddings/test_training_integration.py
diff --git a/tests/module_12/run_all_tests.py b/tests/12_attention/run_all_tests.py
similarity index 100%
rename from tests/module_12/run_all_tests.py
rename to tests/12_attention/run_all_tests.py
diff --git a/tests/module_12/test_compression_integration.py b/tests/12_attention/test_compression_integration.py
similarity index 100%
rename from tests/module_12/test_compression_integration.py
rename to tests/12_attention/test_compression_integration.py
diff --git a/tests/module_12/test_progressive_integration.py b/tests/12_attention/test_progressive_integration.py
similarity index 100%
rename from tests/module_12/test_progressive_integration.py
rename to tests/12_attention/test_progressive_integration.py
diff --git a/tests/module_13/run_all_tests.py b/tests/13_transformers/run_all_tests.py
similarity index 100%
rename from tests/module_13/run_all_tests.py
rename to tests/13_transformers/run_all_tests.py
diff --git a/tests/module_13/test_kernels_integration.py b/tests/13_transformers/test_kernels_integration.py
similarity index 100%
rename from tests/module_13/test_kernels_integration.py
rename to tests/13_transformers/test_kernels_integration.py
diff --git a/tests/module_13/test_progressive_integration.py b/tests/13_transformers/test_progressive_integration.py
similarity index 100%
rename from tests/module_13/test_progressive_integration.py
rename to tests/13_transformers/test_progressive_integration.py
diff --git a/tests/module_14/run_all_tests.py b/tests/14_kvcaching/run_all_tests.py
similarity index 100%
rename from tests/module_14/run_all_tests.py
rename to tests/14_kvcaching/run_all_tests.py
diff --git a/tests/module_14/test_benchmarking_integration.py b/tests/14_kvcaching/test_benchmarking_integration.py
similarity index 100%
rename from tests/module_14/test_benchmarking_integration.py
rename to tests/14_kvcaching/test_benchmarking_integration.py
diff --git a/tests/module_14/test_progressive_integration.py b/tests/14_kvcaching/test_progressive_integration.py
similarity index 100%
rename from tests/module_14/test_progressive_integration.py
rename to tests/14_kvcaching/test_progressive_integration.py
diff --git a/tests/module_15/run_all_tests.py b/tests/15_profiling/run_all_tests.py
similarity index 100%
rename from tests/module_15/run_all_tests.py
rename to tests/15_profiling/run_all_tests.py
diff --git a/tests/module_15/test_mlops_integration.py b/tests/15_profiling/test_mlops_integration.py
similarity index 100%
rename from tests/module_15/test_mlops_integration.py
rename to tests/15_profiling/test_mlops_integration.py
diff --git a/tests/module_15/test_progressive_integration.py b/tests/15_profiling/test_progressive_integration.py
similarity index 100%
rename from tests/module_15/test_progressive_integration.py
rename to tests/15_profiling/test_progressive_integration.py
diff --git a/tests/module_15/test_tinygpt_integration.py b/tests/15_profiling/test_tinygpt_integration.py
similarity index 100%
rename from tests/module_15/test_tinygpt_integration.py
rename to tests/15_profiling/test_tinygpt_integration.py