diff --git a/test/ttmlir/Dialect/TTNN/input_layout_loc_override.mlir b/test/ttmlir/Dialect/TTNN/optimizer/input_layout_loc_override.mlir
similarity index 100%
rename from test/ttmlir/Dialect/TTNN/input_layout_loc_override.mlir
rename to test/ttmlir/Dialect/TTNN/optimizer/input_layout_loc_override.mlir
diff --git a/test/ttmlir/Dialect/TTNN/mnist_sharding.mlir b/test/ttmlir/Dialect/TTNN/optimizer/mnist_sharding.mlir
similarity index 100%
rename from test/ttmlir/Dialect/TTNN/mnist_sharding.mlir
rename to test/ttmlir/Dialect/TTNN/optimizer/mnist_sharding.mlir
diff --git a/test/ttmlir/Dialect/TTNN/multiple_add_with_loc.mlir b/test/ttmlir/Dialect/TTNN/optimizer/multiple_add_with_loc.mlir
similarity index 100%
rename from test/ttmlir/Dialect/TTNN/multiple_add_with_loc.mlir
rename to test/ttmlir/Dialect/TTNN/optimizer/multiple_add_with_loc.mlir
diff --git a/test/ttmlir/Dialect/TTNN/multiple_add_with_loc_input_layout_override.mlir b/test/ttmlir/Dialect/TTNN/optimizer/multiple_add_with_loc_input_layout_override.mlir
similarity index 100%
rename from test/ttmlir/Dialect/TTNN/multiple_add_with_loc_input_layout_override.mlir
rename to test/ttmlir/Dialect/TTNN/optimizer/multiple_add_with_loc_input_layout_override.mlir
diff --git a/test/ttmlir/Dialect/TTNN/multiple_add_with_loc_output_layout_override.mlir b/test/ttmlir/Dialect/TTNN/optimizer/multiple_add_with_loc_output_layout_override.mlir
similarity index 100%
rename from test/ttmlir/Dialect/TTNN/multiple_add_with_loc_output_layout_override.mlir
rename to test/ttmlir/Dialect/TTNN/optimizer/multiple_add_with_loc_output_layout_override.mlir
diff --git a/test/ttmlir/Dialect/TTNN/sharding_matmul_override_0.mlir b/test/ttmlir/Dialect/TTNN/optimizer/sharding_matmul_override_0.mlir
similarity index 100%
rename from test/ttmlir/Dialect/TTNN/sharding_matmul_override_0.mlir
rename to test/ttmlir/Dialect/TTNN/optimizer/sharding_matmul_override_0.mlir
diff --git a/test/ttmlir/Dialect/TTNN/sharding_matmul_override_32.mlir b/test/ttmlir/Dialect/TTNN/optimizer/sharding_matmul_override_32.mlir
similarity index 100%
rename from test/ttmlir/Dialect/TTNN/sharding_matmul_override_32.mlir
rename to test/ttmlir/Dialect/TTNN/optimizer/sharding_matmul_override_32.mlir
diff --git a/test/ttmlir/Dialect/TTNN/test_grid_set.mlir b/test/ttmlir/Dialect/TTNN/optimizer/test_grid_set.mlir
similarity index 100%
rename from test/ttmlir/Dialect/TTNN/test_grid_set.mlir
rename to test/ttmlir/Dialect/TTNN/optimizer/test_grid_set.mlir
diff --git a/test/ttmlir/Dialect/TTNN/test_override_reshard_edges.mlir b/test/ttmlir/Dialect/TTNN/optimizer/test_override_reshard_edges.mlir
similarity index 100%
rename from test/ttmlir/Dialect/TTNN/test_override_reshard_edges.mlir
rename to test/ttmlir/Dialect/TTNN/optimizer/test_override_reshard_edges.mlir
diff --git a/test/ttmlir/Dialect/TTNN/ttir_to_ttnn_pipeline.mlir b/test/ttmlir/Dialect/TTNN/optimizer/ttir_to_ttnn_pipeline.mlir
similarity index 100%
rename from test/ttmlir/Dialect/TTNN/ttir_to_ttnn_pipeline.mlir
rename to test/ttmlir/Dialect/TTNN/optimizer/ttir_to_ttnn_pipeline.mlir
diff --git a/test/ttmlir/Silicon/TTNN/all_l1_interleaved_policy.mlir b/test/ttmlir/Silicon/TTNN/optimizer/all_l1_interleaved_policy.mlir
similarity index 100%
rename from test/ttmlir/Silicon/TTNN/all_l1_interleaved_policy.mlir
rename to test/ttmlir/Silicon/TTNN/optimizer/all_l1_interleaved_policy.mlir
diff --git a/test/ttmlir/Silicon/TTNN/large_tensors.mlir b/test/ttmlir/Silicon/TTNN/optimizer/large_tensors.mlir
similarity index 100%
rename from test/ttmlir/Silicon/TTNN/large_tensors.mlir
rename to test/ttmlir/Silicon/TTNN/optimizer/large_tensors.mlir
diff --git a/test/ttmlir/Silicon/TTNN/mnist_l1_interleaved.mlir b/test/ttmlir/Silicon/TTNN/optimizer/mnist_l1_interleaved.mlir
similarity index 100%
rename from test/ttmlir/Silicon/TTNN/mnist_l1_interleaved.mlir
rename to test/ttmlir/Silicon/TTNN/optimizer/mnist_l1_interleaved.mlir
diff --git a/test/ttmlir/Silicon/TTNN/sharded/mnist_sharding_tiled.mlir b/test/ttmlir/Silicon/TTNN/optimizer/mnist_sharding_tiled.mlir
similarity index 100%
rename from test/ttmlir/Silicon/TTNN/sharded/mnist_sharding_tiled.mlir
rename to test/ttmlir/Silicon/TTNN/optimizer/mnist_sharding_tiled.mlir
diff --git a/test/ttmlir/Silicon/TTNN/simple_fork_join.mlir b/test/ttmlir/Silicon/TTNN/optimizer/simple_fork_join.mlir
similarity index 100%
rename from test/ttmlir/Silicon/TTNN/simple_fork_join.mlir
rename to test/ttmlir/Silicon/TTNN/optimizer/simple_fork_join.mlir