diff --git a/test/libsolidity/semanticTests/viaYul/array_2d_assignment.sol b/test/libsolidity/semanticTests/array/array_2d_assignment.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_2d_assignment.sol
rename to test/libsolidity/semanticTests/array/array_2d_assignment.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_2d_new.sol b/test/libsolidity/semanticTests/array/array_2d_new.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_2d_new.sol
rename to test/libsolidity/semanticTests/array/array_2d_new.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_3d_assignment.sol b/test/libsolidity/semanticTests/array/array_3d_assignment.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_3d_assignment.sol
rename to test/libsolidity/semanticTests/array/array_3d_assignment.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_3d_new.sol b/test/libsolidity/semanticTests/array/array_3d_new.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_3d_new.sol
rename to test/libsolidity/semanticTests/array/array_3d_new.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_function_pointers.sol b/test/libsolidity/semanticTests/array/array_function_pointers.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_function_pointers.sol
rename to test/libsolidity/semanticTests/array/array_function_pointers.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_2d_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_allocation/array_2d_zeroed_memory_index_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_2d_zeroed_memory_index_access.sol
rename to test/libsolidity/semanticTests/array/array_memory_allocation/array_2d_zeroed_memory_index_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_array_static.sol b/test/libsolidity/semanticTests/array/array_memory_allocation/array_array_static.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_array_static.sol
rename to test/libsolidity/semanticTests/array/array_memory_allocation/array_array_static.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol
rename to test/libsolidity/semanticTests/array/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_allocation/array_static_zeroed_memory_index_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_zeroed_memory_index_access.sol
rename to test/libsolidity/semanticTests/array/array_memory_allocation/array_static_zeroed_memory_index_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_allocation/array_zeroed_memory_index_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_zeroed_memory_index_access.sol
rename to test/libsolidity/semanticTests/array/array_memory_allocation/array_zeroed_memory_index_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol b/test/libsolidity/semanticTests/array/array_memory_as_parameter.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol
rename to test/libsolidity/semanticTests/array/array_memory_as_parameter.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_create.sol b/test/libsolidity/semanticTests/array/array_memory_create.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_memory_create.sol
rename to test/libsolidity/semanticTests/array/array_memory_create.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_index_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
rename to test/libsolidity/semanticTests/array/array_memory_index_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_push_return_reference.sol b/test/libsolidity/semanticTests/array/array_push_return_reference.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_push_return_reference.sol
rename to test/libsolidity/semanticTests/array/array_push_return_reference.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_push_with_arg.sol b/test/libsolidity/semanticTests/array/array_push_with_arg.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_push_with_arg.sol
rename to test/libsolidity/semanticTests/array/array_push_with_arg.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol b/test/libsolidity/semanticTests/array/array_storage_index_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
rename to test/libsolidity/semanticTests/array/array_storage_index_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol b/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
rename to test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
rename to test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol b/test/libsolidity/semanticTests/array/array_storage_length_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
rename to test/libsolidity/semanticTests/array/array_storage_length_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_pop_zero_length.sol b/test/libsolidity/semanticTests/array/array_storage_pop_zero_length.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_storage_pop_zero_length.sol
rename to test/libsolidity/semanticTests/array/array_storage_pop_zero_length.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol b/test/libsolidity/semanticTests/array/array_storage_push_empty.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
rename to test/libsolidity/semanticTests/array/array_storage_push_empty.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol b/test/libsolidity/semanticTests/array/array_storage_push_empty_length_address.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
rename to test/libsolidity/semanticTests/array/array_storage_push_empty_length_address.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol b/test/libsolidity/semanticTests/array/array_storage_push_pop.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
rename to test/libsolidity/semanticTests/array/array_storage_push_pop.sol
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_array_access.sol b/test/libsolidity/semanticTests/calldata/calldata_array_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/calldata_array_access.sol
rename to test/libsolidity/semanticTests/calldata/calldata_array_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_array_index_range_access.sol b/test/libsolidity/semanticTests/calldata/calldata_array_index_range_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/calldata_array_index_range_access.sol
rename to test/libsolidity/semanticTests/calldata/calldata_array_index_range_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_array_length.sol b/test/libsolidity/semanticTests/calldata/calldata_array_length.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/calldata_array_length.sol
rename to test/libsolidity/semanticTests/calldata/calldata_array_length.sol
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_array_three_dimensional.sol b/test/libsolidity/semanticTests/calldata/calldata_array_three_dimensional.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/calldata_array_three_dimensional.sol
rename to test/libsolidity/semanticTests/calldata/calldata_array_three_dimensional.sol
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_bytes_array_bounds.sol b/test/libsolidity/semanticTests/calldata/calldata_bytes_array_bounds.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/calldata_bytes_array_bounds.sol
rename to test/libsolidity/semanticTests/calldata/calldata_bytes_array_bounds.sol