diff --git a/test/libsolidity/semanticTests/extracted/abi_decode_dynamic_array.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/abi_decode_dynamic_array.sol
rename to test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol
diff --git a/test/libsolidity/semanticTests/extracted/abi_decode_static_array.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/abi_decode_static_array.sol
rename to test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol
diff --git a/test/libsolidity/semanticTests/extracted/abi_decode_static_array_v2.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/abi_decode_static_array_v2.sol
rename to test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol
diff --git a/test/libsolidity/semanticTests/extracted/abi_decode_trivial.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/abi_decode_trivial.sol
rename to test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol
diff --git a/test/libsolidity/semanticTests/extracted/abi_decode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/abi_decode_v2.sol
rename to test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol
diff --git a/test/libsolidity/semanticTests/extracted/abi_decode_v2_calldata.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/abi_decode_v2_calldata.sol
rename to test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol
diff --git a/test/libsolidity/semanticTests/extracted/abi_decode_v2_storage.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/abi_decode_v2_storage.sol
rename to test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
diff --git a/test/libsolidity/semanticTests/extracted/abi_encode.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/abi_encode.sol
rename to test/libsolidity/semanticTests/abiEncoderV1/abi_encode.sol
diff --git a/test/libsolidity/semanticTests/extracted/abi_encode_call.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/abi_encode_call.sol
rename to test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol
diff --git a/test/libsolidity/semanticTests/extracted/abi_encode_decode_simple.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_decode_simple.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/abi_encode_decode_simple.sol
rename to test/libsolidity/semanticTests/abiEncoderV1/abi_encode_decode_simple.sol
diff --git a/test/libsolidity/semanticTests/extracted/abi_encode_rational.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_rational.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/abi_encode_rational.sol
rename to test/libsolidity/semanticTests/abiEncoderV1/abi_encode_rational.sol
diff --git a/test/libsolidity/semanticTests/abiDecodeV1/decode_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/decode_slice.sol
similarity index 100%
rename from test/libsolidity/semanticTests/abiDecodeV1/decode_slice.sol
rename to test/libsolidity/semanticTests/abiEncoderV1/decode_slice.sol
diff --git a/test/libsolidity/semanticTests/abiDecodeV1/dynamic_memory_copy.sol b/test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol
similarity index 100%
rename from test/libsolidity/semanticTests/abiDecodeV1/dynamic_memory_copy.sol
rename to test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol
diff --git a/test/libsolidity/semanticTests/extracted/abi_encode_empty_string_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_empty_string_v2.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/abi_encode_empty_string_v2.sol
rename to test/libsolidity/semanticTests/abiEncoderV2/abi_encode_empty_string_v2.sol
diff --git a/test/libsolidity/semanticTests/extracted/abi_encode_rational_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_rational_v2.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/abi_encode_rational_v2.sol
rename to test/libsolidity/semanticTests/abiEncoderV2/abi_encode_rational_v2.sol
diff --git a/test/libsolidity/semanticTests/extracted/abi_encode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/abi_encode_v2.sol
rename to test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
diff --git a/test/libsolidity/semanticTests/extracted/accessor_for_const_state_variable.sol b/test/libsolidity/semanticTests/accessor/accessor_for_const_state_variable.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/accessor_for_const_state_variable.sol
rename to test/libsolidity/semanticTests/accessor/accessor_for_const_state_variable.sol
diff --git a/test/libsolidity/semanticTests/extracted/accessor_for_state_variable.sol b/test/libsolidity/semanticTests/accessor/accessor_for_state_variable.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/accessor_for_state_variable.sol
rename to test/libsolidity/semanticTests/accessor/accessor_for_state_variable.sol
diff --git a/test/libsolidity/semanticTests/extracted/addmod_mulmod.sol b/test/libsolidity/semanticTests/arithmetics/addmod_mulmod.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/addmod_mulmod.sol
rename to test/libsolidity/semanticTests/arithmetics/addmod_mulmod.sol
diff --git a/test/libsolidity/semanticTests/extracted/addmod_mulmod_zero.sol b/test/libsolidity/semanticTests/arithmetics/addmod_mulmod_zero.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/addmod_mulmod_zero.sol
rename to test/libsolidity/semanticTests/arithmetics/addmod_mulmod_zero.sol
diff --git a/test/libsolidity/semanticTests/extracted/divisiod_by_zero.sol b/test/libsolidity/semanticTests/arithmetics/divisiod_by_zero.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/divisiod_by_zero.sol
rename to test/libsolidity/semanticTests/arithmetics/divisiod_by_zero.sol
diff --git a/test/libsolidity/semanticTests/extracted/array_copy_different_packing.sol b/test/libsolidity/semanticTests/array/array_copy_different_packing.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/array_copy_different_packing.sol
rename to test/libsolidity/semanticTests/array/array_copy_different_packing.sol
diff --git a/test/libsolidity/semanticTests/extracted/array_copy_nested_array.sol b/test/libsolidity/semanticTests/array/array_copy_nested_array.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/array_copy_nested_array.sol
rename to test/libsolidity/semanticTests/array/array_copy_nested_array.sol
diff --git a/test/libsolidity/semanticTests/extracted/array_copy_storage_abi_signed.sol b/test/libsolidity/semanticTests/array/array_copy_storage_abi_signed.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/array_copy_storage_abi_signed.sol
rename to test/libsolidity/semanticTests/array/array_copy_storage_abi_signed.sol
diff --git a/test/libsolidity/semanticTests/extracted/array_copy_storage_storage_static_dynamic.sol b/test/libsolidity/semanticTests/array/array_copy_storage_storage_static_dynamic.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/array_copy_storage_storage_static_dynamic.sol
rename to test/libsolidity/semanticTests/array/array_copy_storage_storage_static_dynamic.sol
diff --git a/test/libsolidity/semanticTests/extracted/array_copy_storage_storage_static_static.sol b/test/libsolidity/semanticTests/array/array_copy_storage_storage_static_static.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/array_copy_storage_storage_static_static.sol
rename to test/libsolidity/semanticTests/array/array_copy_storage_storage_static_static.sol
diff --git a/test/libsolidity/semanticTests/extracted/array_copy_target_leftover2.sol b/test/libsolidity/semanticTests/array/array_copy_target_leftover2.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/array_copy_target_leftover2.sol
rename to test/libsolidity/semanticTests/array/array_copy_target_leftover2.sol
diff --git a/test/libsolidity/semanticTests/extracted/array_copy_target_simple.sol b/test/libsolidity/semanticTests/array/array_copy_target_simple.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/array_copy_target_simple.sol
rename to test/libsolidity/semanticTests/array/array_copy_target_simple.sol
diff --git a/test/libsolidity/semanticTests/extracted/array_pop.sol b/test/libsolidity/semanticTests/array/array_pop.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/array_pop.sol
rename to test/libsolidity/semanticTests/array/array_pop.sol
diff --git a/test/libsolidity/semanticTests/extracted/array_pop_empty_exception.sol b/test/libsolidity/semanticTests/array/array_pop_empty_exception.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/array_pop_empty_exception.sol
rename to test/libsolidity/semanticTests/array/array_pop_empty_exception.sol
diff --git a/test/libsolidity/semanticTests/extracted/array_pop_isolated.sol b/test/libsolidity/semanticTests/array/array_pop_isolated.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/array_pop_isolated.sol
rename to test/libsolidity/semanticTests/array/array_pop_isolated.sol
diff --git a/test/libsolidity/semanticTests/extracted/array_push.sol b/test/libsolidity/semanticTests/array/array_push.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/array_push.sol
rename to test/libsolidity/semanticTests/array/array_push.sol
diff --git a/test/libsolidity/semanticTests/extracted/array_push_packed_array.sol b/test/libsolidity/semanticTests/array/array_push_packed_array.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/array_push_packed_array.sol
rename to test/libsolidity/semanticTests/array/array_push_packed_array.sol
diff --git a/test/libsolidity/semanticTests/extracted/array_push_struct.sol b/test/libsolidity/semanticTests/array/array_push_struct.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/array_push_struct.sol
rename to test/libsolidity/semanticTests/array/array_push_struct.sol
diff --git a/test/libsolidity/semanticTests/extracted/byte_array_pop.sol b/test/libsolidity/semanticTests/array/byte_array_pop.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/byte_array_pop.sol
rename to test/libsolidity/semanticTests/array/byte_array_pop.sol
diff --git a/test/libsolidity/semanticTests/extracted/byte_array_pop_copy_long.sol b/test/libsolidity/semanticTests/array/byte_array_pop_copy_long.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/byte_array_pop_copy_long.sol
rename to test/libsolidity/semanticTests/array/byte_array_pop_copy_long.sol
diff --git a/test/libsolidity/semanticTests/extracted/byte_array_pop_empty_exception.sol b/test/libsolidity/semanticTests/array/byte_array_pop_empty_exception.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/byte_array_pop_empty_exception.sol
rename to test/libsolidity/semanticTests/array/byte_array_pop_empty_exception.sol
diff --git a/test/libsolidity/semanticTests/extracted/byte_array_pop_isolated.sol b/test/libsolidity/semanticTests/array/byte_array_pop_isolated.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/byte_array_pop_isolated.sol
rename to test/libsolidity/semanticTests/array/byte_array_pop_isolated.sol
diff --git a/test/libsolidity/semanticTests/extracted/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/byte_array_pop_masking_long.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/byte_array_pop_masking_long.sol
rename to test/libsolidity/semanticTests/array/byte_array_pop_masking_long.sol
diff --git a/test/libsolidity/semanticTests/extracted/byte_array_push.sol b/test/libsolidity/semanticTests/array/byte_array_push.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/byte_array_push.sol
rename to test/libsolidity/semanticTests/array/byte_array_push.sol
diff --git a/test/libsolidity/semanticTests/extracted/byte_array_push_transition.sol b/test/libsolidity/semanticTests/array/byte_array_push_transition.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/byte_array_push_transition.sol
rename to test/libsolidity/semanticTests/array/byte_array_push_transition.sol
diff --git a/test/libsolidity/semanticTests/extracted/bytes_delete_element.sol b/test/libsolidity/semanticTests/array/bytes_delete_element.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/bytes_delete_element.sol
rename to test/libsolidity/semanticTests/array/bytes_delete_element.sol
diff --git a/test/libsolidity/semanticTests/extracted/bytes_length_member.sol b/test/libsolidity/semanticTests/array/bytes_length_member.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/bytes_length_member.sol
rename to test/libsolidity/semanticTests/array/bytes_length_member.sol
diff --git a/test/libsolidity/semanticTests/extracted/calldata_array.sol b/test/libsolidity/semanticTests/array/calldata_array.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/calldata_array.sol
rename to test/libsolidity/semanticTests/array/calldata_array.sol
diff --git a/test/libsolidity/semanticTests/extracted/calldata_array_dynamic_invalid.sol b/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/calldata_array_dynamic_invalid.sol
rename to test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid.sol
diff --git a/test/libsolidity/semanticTests/extracted/calldata_array_dynamic_invalid_static_middle.sol b/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid_static_middle.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/calldata_array_dynamic_invalid_static_middle.sol
rename to test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid_static_middle.sol
diff --git a/test/libsolidity/semanticTests/extracted/calldata_array_of_struct.sol b/test/libsolidity/semanticTests/array/calldata_array_of_struct.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/calldata_array_of_struct.sol
rename to test/libsolidity/semanticTests/array/calldata_array_of_struct.sol
diff --git a/test/libsolidity/semanticTests/extracted/calldata_array_of_struct_to_memory.sol b/test/libsolidity/semanticTests/array/calldata_array_of_struct_to_memory.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/calldata_array_of_struct_to_memory.sol
rename to test/libsolidity/semanticTests/array/calldata_array_of_struct_to_memory.sol
diff --git a/test/libsolidity/semanticTests/extracted/calldata_dynamic_array_to_memory.sol b/test/libsolidity/semanticTests/array/calldata_dynamic_array_to_memory.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/calldata_dynamic_array_to_memory.sol
rename to test/libsolidity/semanticTests/array/calldata_dynamic_array_to_memory.sol
diff --git a/test/libsolidity/semanticTests/extracted/constant_var_as_array_length.sol b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/constant_var_as_array_length.sol
rename to test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
diff --git a/test/libsolidity/semanticTests/extracted/copy_function_storage_array.sol b/test/libsolidity/semanticTests/array/copy_function_storage_array.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/copy_function_storage_array.sol
rename to test/libsolidity/semanticTests/array/copy_function_storage_array.sol
diff --git a/test/libsolidity/semanticTests/extracted/copy_internal_function_array_to_storage.sol b/test/libsolidity/semanticTests/array/copy_internal_function_array_to_storage.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/copy_internal_function_array_to_storage.sol
rename to test/libsolidity/semanticTests/array/copy_internal_function_array_to_storage.sol
diff --git a/test/libsolidity/semanticTests/extracted/create_dynamic_array_with_zero_length.sol b/test/libsolidity/semanticTests/array/create_dynamic_array_with_zero_length.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/create_dynamic_array_with_zero_length.sol
rename to test/libsolidity/semanticTests/array/create_dynamic_array_with_zero_length.sol
diff --git a/test/libsolidity/semanticTests/extracted/create_memory_array.sol b/test/libsolidity/semanticTests/array/create_memory_array.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/create_memory_array.sol
rename to test/libsolidity/semanticTests/array/create_memory_array.sol
diff --git a/test/libsolidity/semanticTests/extracted/create_multiple_dynamic_arrays.sol b/test/libsolidity/semanticTests/array/create_multiple_dynamic_arrays.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/create_multiple_dynamic_arrays.sol
rename to test/libsolidity/semanticTests/array/create_multiple_dynamic_arrays.sol
diff --git a/test/libsolidity/semanticTests/extracted/delete_on_array_of_structs.sol b/test/libsolidity/semanticTests/array/delete_on_array_of_structs.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/delete_on_array_of_structs.sol
rename to test/libsolidity/semanticTests/array/delete_on_array_of_structs.sol
diff --git a/test/libsolidity/semanticTests/extracted/dynamic_arrays_in_storage.sol b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/dynamic_arrays_in_storage.sol
rename to test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
diff --git a/test/libsolidity/semanticTests/extracted/dynamic_out_of_bounds_array_access.sol b/test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/dynamic_out_of_bounds_array_access.sol
rename to test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol
diff --git a/test/libsolidity/semanticTests/extracted/evm_exceptions_out_of_band_access.sol b/test/libsolidity/semanticTests/array/evm_exceptions_out_of_band_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/evm_exceptions_out_of_band_access.sol
rename to test/libsolidity/semanticTests/array/evm_exceptions_out_of_band_access.sol
diff --git a/test/libsolidity/semanticTests/extracted/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/fixed_arrays_as_return_type.sol
rename to test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
diff --git a/test/libsolidity/semanticTests/extracted/fixed_arrays_in_constructors.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/fixed_arrays_in_constructors.sol
rename to test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
diff --git a/test/libsolidity/semanticTests/extracted/fixed_bytes_length_access.sol b/test/libsolidity/semanticTests/array/fixed_bytes_length_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/fixed_bytes_length_access.sol
rename to test/libsolidity/semanticTests/array/fixed_bytes_length_access.sol
diff --git a/test/libsolidity/semanticTests/extracted/fixed_out_of_bounds_array_access.sol b/test/libsolidity/semanticTests/array/fixed_out_of_bounds_array_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/fixed_out_of_bounds_array_access.sol
rename to test/libsolidity/semanticTests/array/fixed_out_of_bounds_array_access.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_array_cross_calls.sol
rename to test/libsolidity/semanticTests/array/function_array_cross_calls.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_memory_array.sol b/test/libsolidity/semanticTests/array/function_memory_array.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_memory_array.sol
rename to test/libsolidity/semanticTests/array/function_memory_array.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_array_index_access_ints.sol b/test/libsolidity/semanticTests/array/inline_array_index_access_ints.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_array_index_access_ints.sol
rename to test/libsolidity/semanticTests/array/inline_array_index_access_ints.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_array_index_access_strings.sol b/test/libsolidity/semanticTests/array/inline_array_index_access_strings.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_array_index_access_strings.sol
rename to test/libsolidity/semanticTests/array/inline_array_index_access_strings.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_array_return.sol b/test/libsolidity/semanticTests/array/inline_array_return.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_array_return.sol
rename to test/libsolidity/semanticTests/array/inline_array_return.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_array_singleton.sol b/test/libsolidity/semanticTests/array/inline_array_singleton.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_array_singleton.sol
rename to test/libsolidity/semanticTests/array/inline_array_singleton.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_array_storage_to_memory_conversion_ints.sol b/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_ints.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_array_storage_to_memory_conversion_ints.sol
rename to test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_ints.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_array_storage_to_memory_conversion_strings.sol b/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_strings.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_array_storage_to_memory_conversion_strings.sol
rename to test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_strings.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_array_strings_from_document.sol b/test/libsolidity/semanticTests/array/inline_array_strings_from_document.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_array_strings_from_document.sol
rename to test/libsolidity/semanticTests/array/inline_array_strings_from_document.sol
diff --git a/test/libsolidity/semanticTests/extracted/memory_arrays_of_various_sizes.sol b/test/libsolidity/semanticTests/array/memory_arrays_of_various_sizes.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/memory_arrays_of_various_sizes.sol
rename to test/libsolidity/semanticTests/array/memory_arrays_of_various_sizes.sol
diff --git a/test/libsolidity/semanticTests/extracted/storage_array_ref.sol b/test/libsolidity/semanticTests/array/storage_array_ref.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/storage_array_ref.sol
rename to test/libsolidity/semanticTests/array/storage_array_ref.sol
diff --git a/test/libsolidity/semanticTests/extracted/keccak256_empty.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_empty.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/keccak256_empty.sol
rename to test/libsolidity/semanticTests/builtinFunctions/keccak256_empty.sol
diff --git a/test/libsolidity/semanticTests/extracted/keccak256_with_bytes.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/keccak256_with_bytes.sol
rename to test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol
diff --git a/test/libsolidity/semanticTests/extracted/ripemd160_empty.sol b/test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/ripemd160_empty.sol
rename to test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol
diff --git a/test/libsolidity/semanticTests/extracted/sha256_empty.sol b/test/libsolidity/semanticTests/builtinFunctions/sha256_empty.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/sha256_empty.sol
rename to test/libsolidity/semanticTests/builtinFunctions/sha256_empty.sol
diff --git a/test/libsolidity/semanticTests/extracted/cleanup_address_types_shortening.sol b/test/libsolidity/semanticTests/cleanup/cleanup_address_types_shortening.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/cleanup_address_types_shortening.sol
rename to test/libsolidity/semanticTests/cleanup/cleanup_address_types_shortening.sol
diff --git a/test/libsolidity/semanticTests/extracted/cleanup_bytes_types_shortening.sol b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/cleanup_bytes_types_shortening.sol
rename to test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening.sol
diff --git a/test/libsolidity/semanticTests/extracted/cleanup_in_compound_assign.sol b/test/libsolidity/semanticTests/cleanup/cleanup_in_compound_assign.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/cleanup_in_compound_assign.sol
rename to test/libsolidity/semanticTests/cleanup/cleanup_in_compound_assign.sol
diff --git a/test/libsolidity/semanticTests/extracted/exp_cleanup.sol b/test/libsolidity/semanticTests/cleanup/exp_cleanup.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/exp_cleanup.sol
rename to test/libsolidity/semanticTests/cleanup/exp_cleanup.sol
diff --git a/test/libsolidity/semanticTests/extracted/exp_cleanup_direct.sol b/test/libsolidity/semanticTests/cleanup/exp_cleanup_direct.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/exp_cleanup_direct.sol
rename to test/libsolidity/semanticTests/cleanup/exp_cleanup_direct.sol
diff --git a/test/libsolidity/semanticTests/extracted/exp_cleanup_nonzero_base.sol b/test/libsolidity/semanticTests/cleanup/exp_cleanup_nonzero_base.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/exp_cleanup_nonzero_base.sol
rename to test/libsolidity/semanticTests/cleanup/exp_cleanup_nonzero_base.sol
diff --git a/test/libsolidity/semanticTests/extracted/constant_string.sol b/test/libsolidity/semanticTests/constants/constant_string.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/constant_string.sol
rename to test/libsolidity/semanticTests/constants/constant_string.sol
diff --git a/test/libsolidity/semanticTests/extracted/constant_variables.sol b/test/libsolidity/semanticTests/constants/constant_variables.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/constant_variables.sol
rename to test/libsolidity/semanticTests/constants/constant_variables.sol
diff --git a/test/libsolidity/semanticTests/extracted/simple_constant_variables_test.sol b/test/libsolidity/semanticTests/constants/simple_constant_variables_test.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/simple_constant_variables_test.sol
rename to test/libsolidity/semanticTests/constants/simple_constant_variables_test.sol
diff --git a/test/libsolidity/semanticTests/extracted/base_constructor_arguments.sol b/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/base_constructor_arguments.sol
rename to test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol
diff --git a/test/libsolidity/semanticTests/extracted/constructor_arguments_external.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/constructor_arguments_external.sol
rename to test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
diff --git a/test/libsolidity/semanticTests/extracted/constructor_arguments_internal.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/constructor_arguments_internal.sol
rename to test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol
diff --git a/test/libsolidity/semanticTests/extracted/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/constructor_static_array_argument.sol
rename to test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
diff --git a/test/libsolidity/semanticTests/extracted/evm_exceptions_in_constructor_call_fail.sol b/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/evm_exceptions_in_constructor_call_fail.sol
rename to test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_usage_in_constructor_arguments.sol b/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_usage_in_constructor_arguments.sol
rename to test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol
diff --git a/test/libsolidity/semanticTests/extracted/functions_called_by_constructor.sol b/test/libsolidity/semanticTests/constructor/functions_called_by_constructor.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/functions_called_by_constructor.sol
rename to test/libsolidity/semanticTests/constructor/functions_called_by_constructor.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_member_init_inheritence_without_constructor.sol b/test/libsolidity/semanticTests/constructor/inline_member_init_inheritence_without_constructor.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_member_init_inheritence_without_constructor.sol
rename to test/libsolidity/semanticTests/constructor/inline_member_init_inheritence_without_constructor.sol
diff --git a/test/libsolidity/semanticTests/extracted/payable_constructor.sol b/test/libsolidity/semanticTests/constructor/payable_constructor.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/payable_constructor.sol
rename to test/libsolidity/semanticTests/constructor/payable_constructor.sol
diff --git a/test/libsolidity/semanticTests/extracted/store_function_in_constructor.sol b/test/libsolidity/semanticTests/constructor/store_function_in_constructor.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/store_function_in_constructor.sol
rename to test/libsolidity/semanticTests/constructor/store_function_in_constructor.sol
diff --git a/test/libsolidity/semanticTests/extracted/store_internal_unused_function_in_constructor.sol b/test/libsolidity/semanticTests/constructor/store_internal_unused_function_in_constructor.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/store_internal_unused_function_in_constructor.sol
rename to test/libsolidity/semanticTests/constructor/store_internal_unused_function_in_constructor.sol
diff --git a/test/libsolidity/semanticTests/extracted/store_internal_unused_library_function_in_constructor.sol b/test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/store_internal_unused_library_function_in_constructor.sol
rename to test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol
diff --git a/test/libsolidity/semanticTests/extracted/constructing_enums_from_ints.sol b/test/libsolidity/semanticTests/enums/constructing_enums_from_ints.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/constructing_enums_from_ints.sol
rename to test/libsolidity/semanticTests/enums/constructing_enums_from_ints.sol
diff --git a/test/libsolidity/semanticTests/extracted/enum_explicit_overflow.sol b/test/libsolidity/semanticTests/enums/enum_explicit_overflow.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/enum_explicit_overflow.sol
rename to test/libsolidity/semanticTests/enums/enum_explicit_overflow.sol
diff --git a/test/libsolidity/semanticTests/extracted/using_contract_enums_with_explicit_contract_name.sol b/test/libsolidity/semanticTests/enums/using_contract_enums_with_explicit_contract_name.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/using_contract_enums_with_explicit_contract_name.sol
rename to test/libsolidity/semanticTests/enums/using_contract_enums_with_explicit_contract_name.sol
diff --git a/test/libsolidity/semanticTests/extracted/using_enums.sol b/test/libsolidity/semanticTests/enums/using_enums.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/using_enums.sol
rename to test/libsolidity/semanticTests/enums/using_enums.sol
diff --git a/test/libsolidity/semanticTests/extracted/using_inherited_enum.sol b/test/libsolidity/semanticTests/enums/using_inherited_enum.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/using_inherited_enum.sol
rename to test/libsolidity/semanticTests/enums/using_inherited_enum.sol
diff --git a/test/libsolidity/semanticTests/extracted/using_inherited_enum_excplicitly.sol b/test/libsolidity/semanticTests/enums/using_inherited_enum_excplicitly.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/using_inherited_enum_excplicitly.sol
rename to test/libsolidity/semanticTests/enums/using_inherited_enum_excplicitly.sol
diff --git a/test/libsolidity/semanticTests/extracted/call_function_returning_function.sol b/test/libsolidity/semanticTests/functionCall/call_function_returning_function.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/call_function_returning_function.sol
rename to test/libsolidity/semanticTests/functionCall/call_function_returning_function.sol
diff --git a/test/libsolidity/semanticTests/extracted/calling_nonexisting_contract_throws.sol b/test/libsolidity/semanticTests/functionCall/calling_nonexisting_contract_throws.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/calling_nonexisting_contract_throws.sol
rename to test/libsolidity/semanticTests/functionCall/calling_nonexisting_contract_throws.sol
diff --git a/test/libsolidity/semanticTests/extracted/calling_uninitialized_function.sol b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/calling_uninitialized_function.sol
rename to test/libsolidity/semanticTests/functionCall/calling_uninitialized_function.sol
diff --git a/test/libsolidity/semanticTests/extracted/calling_uninitialized_function_in_detail.sol b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_in_detail.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/calling_uninitialized_function_in_detail.sol
rename to test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_in_detail.sol
diff --git a/test/libsolidity/semanticTests/extracted/calling_uninitialized_function_through_array.sol b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_through_array.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/calling_uninitialized_function_through_array.sol
rename to test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_through_array.sol
diff --git a/test/libsolidity/semanticTests/extracted/external_function.sol b/test/libsolidity/semanticTests/functionCall/external_function.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/external_function.sol
rename to test/libsolidity/semanticTests/functionCall/external_function.sol
diff --git a/test/libsolidity/semanticTests/extracted/external_public_override.sol b/test/libsolidity/semanticTests/functionCall/external_public_override.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/external_public_override.sol
rename to test/libsolidity/semanticTests/functionCall/external_public_override.sol
diff --git a/test/libsolidity/semanticTests/extracted/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/gas_and_value_basic.sol
rename to test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
diff --git a/test/libsolidity/semanticTests/extracted/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/gas_and_value_brace_syntax.sol
rename to test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
diff --git a/test/libsolidity/semanticTests/extracted/send_zero_ether.sol b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/send_zero_ether.sol
rename to test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_delete_stack.sol b/test/libsolidity/semanticTests/functionTypes/function_delete_stack.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_delete_stack.sol
rename to test/libsolidity/semanticTests/functionTypes/function_delete_stack.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_delete_storage.sol b/test/libsolidity/semanticTests/functionTypes/function_delete_storage.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_delete_storage.sol
rename to test/libsolidity/semanticTests/functionTypes/function_delete_storage.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_type_library_internal.sol b/test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_type_library_internal.sol
rename to test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol
diff --git a/test/libsolidity/semanticTests/extracted/mapping_of_functions.sol b/test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/mapping_of_functions.sol
rename to test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol
diff --git a/test/libsolidity/semanticTests/extracted/pass_function_types_externally.sol b/test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/pass_function_types_externally.sol
rename to test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol
diff --git a/test/libsolidity/semanticTests/extracted/pass_function_types_internally.sol b/test/libsolidity/semanticTests/functionTypes/pass_function_types_internally.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/pass_function_types_internally.sol
rename to test/libsolidity/semanticTests/functionTypes/pass_function_types_internally.sol
diff --git a/test/libsolidity/semanticTests/extracted/same_function_in_construction_and_runtime.sol b/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/same_function_in_construction_and_runtime.sol
rename to test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime.sol
diff --git a/test/libsolidity/semanticTests/extracted/same_function_in_construction_and_runtime_equality_check.sol b/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime_equality_check.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/same_function_in_construction_and_runtime_equality_check.sol
rename to test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime_equality_check.sol
diff --git a/test/libsolidity/semanticTests/extracted/store_function.sol b/test/libsolidity/semanticTests/functionTypes/store_function.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/store_function.sol
rename to test/libsolidity/semanticTests/functionTypes/store_function.sol
diff --git a/test/libsolidity/semanticTests/extracted/uninitialized_internal_storage_function_call.sol b/test/libsolidity/semanticTests/functionTypes/uninitialized_internal_storage_function_call.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/uninitialized_internal_storage_function_call.sol
rename to test/libsolidity/semanticTests/functionTypes/uninitialized_internal_storage_function_call.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_assembly_embedded_function_call.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_embedded_function_call.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_assembly_embedded_function_call.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inline_assembly_embedded_function_call.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_assembly_for.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_assembly_for.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_assembly_for2.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for2.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_assembly_for2.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for2.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_assembly_function_call.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_assembly_function_call.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_assembly_function_call2.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call2.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_assembly_function_call2.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call2.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_assembly_function_call_assignment.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call_assignment.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_assembly_function_call_assignment.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call_assignment.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_assembly_if.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_if.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_assembly_if.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inline_assembly_if.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_assembly_in_modifiers.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_in_modifiers.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_assembly_in_modifiers.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inline_assembly_in_modifiers.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_assembly_memory_access.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_memory_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_assembly_memory_access.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inline_assembly_memory_access.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_assembly_read_and_write_stack.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_read_and_write_stack.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_assembly_read_and_write_stack.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inline_assembly_read_and_write_stack.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_assembly_recursion.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_recursion.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_assembly_recursion.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inline_assembly_recursion.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_assembly_storage_access.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_assembly_storage_access.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_assembly_storage_access_inside_function.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_inside_function.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_assembly_storage_access_inside_function.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_inside_function.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_assembly_storage_access_via_pointer.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_via_pointer.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_assembly_storage_access_via_pointer.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_via_pointer.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_assembly_switch.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_switch.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_assembly_switch.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inline_assembly_switch.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_assembly_write_to_stack.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_write_to_stack.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_assembly_write_to_stack.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inline_assembly_write_to_stack.sol
diff --git a/test/libsolidity/semanticTests/extracted/inlineasm_empty_let.sol b/test/libsolidity/semanticTests/inlineAssembly/inlineasm_empty_let.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inlineasm_empty_let.sol
rename to test/libsolidity/semanticTests/inlineAssembly/inlineasm_empty_let.sol
diff --git a/test/libsolidity/semanticTests/extracted/keccak256_assembly.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/keccak256_assembly.sol
rename to test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol
diff --git a/test/libsolidity/semanticTests/extracted/access_base_storage.sol b/test/libsolidity/semanticTests/intheritance/access_base_storage.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/access_base_storage.sol
rename to test/libsolidity/semanticTests/intheritance/access_base_storage.sol
diff --git a/test/libsolidity/semanticTests/extracted/address_overload_resolution.sol b/test/libsolidity/semanticTests/intheritance/address_overload_resolution.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/address_overload_resolution.sol
rename to test/libsolidity/semanticTests/intheritance/address_overload_resolution.sol
diff --git a/test/libsolidity/semanticTests/extracted/base_access_to_function_type_variables.sol b/test/libsolidity/semanticTests/intheritance/base_access_to_function_type_variables.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/base_access_to_function_type_variables.sol
rename to test/libsolidity/semanticTests/intheritance/base_access_to_function_type_variables.sol
diff --git a/test/libsolidity/semanticTests/extracted/derived_overload_base_function_direct.sol b/test/libsolidity/semanticTests/intheritance/derived_overload_base_function_direct.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/derived_overload_base_function_direct.sol
rename to test/libsolidity/semanticTests/intheritance/derived_overload_base_function_direct.sol
diff --git a/test/libsolidity/semanticTests/extracted/derived_overload_base_function_indirect.sol b/test/libsolidity/semanticTests/intheritance/derived_overload_base_function_indirect.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/derived_overload_base_function_indirect.sol
rename to test/libsolidity/semanticTests/intheritance/derived_overload_base_function_indirect.sol
diff --git a/test/libsolidity/semanticTests/extracted/explicit_base_class.sol b/test/libsolidity/semanticTests/intheritance/explicit_base_class.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/explicit_base_class.sol
rename to test/libsolidity/semanticTests/intheritance/explicit_base_class.sol
diff --git a/test/libsolidity/semanticTests/extracted/inherited_constant_state_var.sol b/test/libsolidity/semanticTests/intheritance/inherited_constant_state_var.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inherited_constant_state_var.sol
rename to test/libsolidity/semanticTests/intheritance/inherited_constant_state_var.sol
diff --git a/test/libsolidity/semanticTests/extracted/inherited_function.sol b/test/libsolidity/semanticTests/intheritance/inherited_function.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inherited_function.sol
rename to test/libsolidity/semanticTests/intheritance/inherited_function.sol
diff --git a/test/libsolidity/semanticTests/extracted/inherited_function_calldata_calldata_interface.sol b/test/libsolidity/semanticTests/intheritance/inherited_function_calldata_calldata_interface.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inherited_function_calldata_calldata_interface.sol
rename to test/libsolidity/semanticTests/intheritance/inherited_function_calldata_calldata_interface.sol
diff --git a/test/libsolidity/semanticTests/extracted/inherited_function_calldata_memory.sol b/test/libsolidity/semanticTests/intheritance/inherited_function_calldata_memory.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inherited_function_calldata_memory.sol
rename to test/libsolidity/semanticTests/intheritance/inherited_function_calldata_memory.sol
diff --git a/test/libsolidity/semanticTests/extracted/inherited_function_calldata_memory_interface.sol b/test/libsolidity/semanticTests/intheritance/inherited_function_calldata_memory_interface.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inherited_function_calldata_memory_interface.sol
rename to test/libsolidity/semanticTests/intheritance/inherited_function_calldata_memory_interface.sol
diff --git a/test/libsolidity/semanticTests/extracted/inherited_function_from_a_library.sol b/test/libsolidity/semanticTests/intheritance/inherited_function_from_a_library.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inherited_function_from_a_library.sol
rename to test/libsolidity/semanticTests/intheritance/inherited_function_from_a_library.sol
diff --git a/test/libsolidity/semanticTests/extracted/overloaded_function_call_resolve_to_first.sol b/test/libsolidity/semanticTests/intheritance/overloaded_function_call_resolve_to_first.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/overloaded_function_call_resolve_to_first.sol
rename to test/libsolidity/semanticTests/intheritance/overloaded_function_call_resolve_to_first.sol
diff --git a/test/libsolidity/semanticTests/extracted/overloaded_function_call_resolve_to_second.sol b/test/libsolidity/semanticTests/intheritance/overloaded_function_call_resolve_to_second.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/overloaded_function_call_resolve_to_second.sol
rename to test/libsolidity/semanticTests/intheritance/overloaded_function_call_resolve_to_second.sol
diff --git a/test/libsolidity/semanticTests/extracted/overloaded_function_call_with_if_else.sol b/test/libsolidity/semanticTests/intheritance/overloaded_function_call_with_if_else.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/overloaded_function_call_with_if_else.sol
rename to test/libsolidity/semanticTests/intheritance/overloaded_function_call_with_if_else.sol
diff --git a/test/libsolidity/semanticTests/extracted/pass_dynamic_arguments_to_the_base.sol b/test/libsolidity/semanticTests/intheritance/pass_dynamic_arguments_to_the_base.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/pass_dynamic_arguments_to_the_base.sol
rename to test/libsolidity/semanticTests/intheritance/pass_dynamic_arguments_to_the_base.sol
diff --git a/test/libsolidity/semanticTests/extracted/pass_dynamic_arguments_to_the_base_base.sol b/test/libsolidity/semanticTests/intheritance/pass_dynamic_arguments_to_the_base_base.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/pass_dynamic_arguments_to_the_base_base.sol
rename to test/libsolidity/semanticTests/intheritance/pass_dynamic_arguments_to_the_base_base.sol
diff --git a/test/libsolidity/semanticTests/extracted/pass_dynamic_arguments_to_the_base_base_with_gap.sol b/test/libsolidity/semanticTests/intheritance/pass_dynamic_arguments_to_the_base_base_with_gap.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/pass_dynamic_arguments_to_the_base_base_with_gap.sol
rename to test/libsolidity/semanticTests/intheritance/pass_dynamic_arguments_to_the_base_base_with_gap.sol
diff --git a/test/libsolidity/semanticTests/extracted/super_in_constructor.sol b/test/libsolidity/semanticTests/intheritance/super_in_constructor.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/super_in_constructor.sol
rename to test/libsolidity/semanticTests/intheritance/super_in_constructor.sol
diff --git a/test/libsolidity/semanticTests/extracted/super_overload.sol b/test/libsolidity/semanticTests/intheritance/super_overload.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/super_overload.sol
rename to test/libsolidity/semanticTests/intheritance/super_overload.sol
diff --git a/test/libsolidity/semanticTests/extracted/value_for_constructor.sol b/test/libsolidity/semanticTests/intheritance/value_for_constructor.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/value_for_constructor.sol
rename to test/libsolidity/semanticTests/intheritance/value_for_constructor.sol
diff --git a/test/libsolidity/semanticTests/extracted/internal_library_function.sol b/test/libsolidity/semanticTests/libraries/internal_library_function.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/internal_library_function.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function.sol
diff --git a/test/libsolidity/semanticTests/extracted/internal_library_function_bound.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/internal_library_function_bound.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_bound.sol
diff --git a/test/libsolidity/semanticTests/extracted/internal_library_function_calling_private.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/internal_library_function_calling_private.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol
diff --git a/test/libsolidity/semanticTests/extracted/internal_library_function_return_var_size.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/internal_library_function_return_var_size.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol
diff --git a/test/libsolidity/semanticTests/extracted/library_enum_as_an_expression.sol b/test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/library_enum_as_an_expression.sol
rename to test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol
diff --git a/test/libsolidity/semanticTests/extracted/library_struct_as_an_expression.sol b/test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/library_struct_as_an_expression.sol
rename to test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol
diff --git a/test/libsolidity/semanticTests/extracted/scientific_notation.sol b/test/libsolidity/semanticTests/literals/scientific_notation.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/scientific_notation.sol
rename to test/libsolidity/semanticTests/literals/scientific_notation.sol
diff --git a/test/libsolidity/semanticTests/extracted/break_in_modifier.sol b/test/libsolidity/semanticTests/modifiers/break_in_modifier.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/break_in_modifier.sol
rename to test/libsolidity/semanticTests/modifiers/break_in_modifier.sol
diff --git a/test/libsolidity/semanticTests/extracted/continue_in_modifier.sol b/test/libsolidity/semanticTests/modifiers/continue_in_modifier.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/continue_in_modifier.sol
rename to test/libsolidity/semanticTests/modifiers/continue_in_modifier.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_modifier.sol b/test/libsolidity/semanticTests/modifiers/function_modifier.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_modifier.sol
rename to test/libsolidity/semanticTests/modifiers/function_modifier.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_modifier_calling_functions_in_creation_context.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_calling_functions_in_creation_context.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_modifier_calling_functions_in_creation_context.sol
rename to test/libsolidity/semanticTests/modifiers/function_modifier_calling_functions_in_creation_context.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_modifier_for_constructor.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_for_constructor.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_modifier_for_constructor.sol
rename to test/libsolidity/semanticTests/modifiers/function_modifier_for_constructor.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_modifier_library.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_library.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_modifier_library.sol
rename to test/libsolidity/semanticTests/modifiers/function_modifier_library.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_modifier_library_inheritance.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_modifier_library_inheritance.sol
rename to test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_modifier_local_variables.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_local_variables.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_modifier_local_variables.sol
rename to test/libsolidity/semanticTests/modifiers/function_modifier_local_variables.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_modifier_loop.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_loop.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_modifier_loop.sol
rename to test/libsolidity/semanticTests/modifiers/function_modifier_loop.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_modifier_multi_invocation.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_multi_invocation.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_modifier_multi_invocation.sol
rename to test/libsolidity/semanticTests/modifiers/function_modifier_multi_invocation.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_modifier_multi_with_return.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_multi_with_return.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_modifier_multi_with_return.sol
rename to test/libsolidity/semanticTests/modifiers/function_modifier_multi_with_return.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_modifier_multiple_times.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_modifier_multiple_times.sol
rename to test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_modifier_multiple_times_local_vars.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times_local_vars.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_modifier_multiple_times_local_vars.sol
rename to test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times_local_vars.sol
diff --git a/test/libsolidity/semanticTests/extracted/function_modifier_overriding.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_overriding.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/function_modifier_overriding.sol
rename to test/libsolidity/semanticTests/modifiers/function_modifier_overriding.sol
diff --git a/test/libsolidity/semanticTests/extracted/return_does_not_skip_modifier.sol b/test/libsolidity/semanticTests/modifiers/return_does_not_skip_modifier.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/return_does_not_skip_modifier.sol
rename to test/libsolidity/semanticTests/modifiers/return_does_not_skip_modifier.sol
diff --git a/test/libsolidity/semanticTests/extracted/return_in_modifier.sol b/test/libsolidity/semanticTests/modifiers/return_in_modifier.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/return_in_modifier.sol
rename to test/libsolidity/semanticTests/modifiers/return_in_modifier.sol
diff --git a/test/libsolidity/semanticTests/extracted/stacked_return_with_modifiers.sol b/test/libsolidity/semanticTests/modifiers/stacked_return_with_modifiers.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/stacked_return_with_modifiers.sol
rename to test/libsolidity/semanticTests/modifiers/stacked_return_with_modifiers.sol
diff --git a/test/libsolidity/semanticTests/extracted/assert_require.sol b/test/libsolidity/semanticTests/reverts/assert_require.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/assert_require.sol
rename to test/libsolidity/semanticTests/reverts/assert_require.sol
diff --git a/test/libsolidity/semanticTests/extracted/invalid_enum_as_external_arg.sol b/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_arg.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/invalid_enum_as_external_arg.sol
rename to test/libsolidity/semanticTests/reverts/invalid_enum_as_external_arg.sol
diff --git a/test/libsolidity/semanticTests/extracted/invalid_enum_as_external_ret.sol b/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_ret.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/invalid_enum_as_external_ret.sol
rename to test/libsolidity/semanticTests/reverts/invalid_enum_as_external_ret.sol
diff --git a/test/libsolidity/semanticTests/extracted/invalid_enum_compared.sol b/test/libsolidity/semanticTests/reverts/invalid_enum_compared.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/invalid_enum_compared.sol
rename to test/libsolidity/semanticTests/reverts/invalid_enum_compared.sol
diff --git a/test/libsolidity/semanticTests/extracted/invalid_enum_stored.sol b/test/libsolidity/semanticTests/reverts/invalid_enum_stored.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/invalid_enum_stored.sol
rename to test/libsolidity/semanticTests/reverts/invalid_enum_stored.sol
diff --git a/test/libsolidity/semanticTests/extracted/invalid_instruction.sol b/test/libsolidity/semanticTests/reverts/invalid_instruction.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/invalid_instruction.sol
rename to test/libsolidity/semanticTests/reverts/invalid_instruction.sol
diff --git a/test/libsolidity/semanticTests/extracted/revert.sol b/test/libsolidity/semanticTests/reverts/revert.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/revert.sol
rename to test/libsolidity/semanticTests/reverts/revert.sol
diff --git a/test/libsolidity/semanticTests/extracted/simple_throw.sol b/test/libsolidity/semanticTests/reverts/simple_throw.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/simple_throw.sol
rename to test/libsolidity/semanticTests/reverts/simple_throw.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_cleanup.sol b/test/libsolidity/semanticTests/shifts/shift_cleanup.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_cleanup.sol
rename to test/libsolidity/semanticTests/shifts/shift_cleanup.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_cleanup_garbled.sol b/test/libsolidity/semanticTests/shifts/shift_cleanup_garbled.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_cleanup_garbled.sol
rename to test/libsolidity/semanticTests/shifts/shift_cleanup_garbled.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_constant_left.sol b/test/libsolidity/semanticTests/shifts/shift_constant_left.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_constant_left.sol
rename to test/libsolidity/semanticTests/shifts/shift_constant_left.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_constant_left_assignment.sol b/test/libsolidity/semanticTests/shifts/shift_constant_left_assignment.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_constant_left_assignment.sol
rename to test/libsolidity/semanticTests/shifts/shift_constant_left_assignment.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_constant_right.sol b/test/libsolidity/semanticTests/shifts/shift_constant_right.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_constant_right.sol
rename to test/libsolidity/semanticTests/shifts/shift_constant_right.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_constant_right_assignment.sol b/test/libsolidity/semanticTests/shifts/shift_constant_right_assignment.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_constant_right_assignment.sol
rename to test/libsolidity/semanticTests/shifts/shift_constant_right_assignment.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_left.sol b/test/libsolidity/semanticTests/shifts/shift_left.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_left.sol
rename to test/libsolidity/semanticTests/shifts/shift_left.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_left_assignment.sol b/test/libsolidity/semanticTests/shifts/shift_left_assignment.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_left_assignment.sol
rename to test/libsolidity/semanticTests/shifts/shift_left_assignment.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_left_assignment_different_type.sol b/test/libsolidity/semanticTests/shifts/shift_left_assignment_different_type.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_left_assignment_different_type.sol
rename to test/libsolidity/semanticTests/shifts/shift_left_assignment_different_type.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_left_larger_type.sol b/test/libsolidity/semanticTests/shifts/shift_left_larger_type.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_left_larger_type.sol
rename to test/libsolidity/semanticTests/shifts/shift_left_larger_type.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_left_uint32.sol b/test/libsolidity/semanticTests/shifts/shift_left_uint32.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_left_uint32.sol
rename to test/libsolidity/semanticTests/shifts/shift_left_uint32.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_left_uint8.sol b/test/libsolidity/semanticTests/shifts/shift_left_uint8.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_left_uint8.sol
rename to test/libsolidity/semanticTests/shifts/shift_left_uint8.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_negative_constant_left.sol b/test/libsolidity/semanticTests/shifts/shift_negative_constant_left.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_negative_constant_left.sol
rename to test/libsolidity/semanticTests/shifts/shift_negative_constant_left.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_negative_constant_right.sol b/test/libsolidity/semanticTests/shifts/shift_negative_constant_right.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_negative_constant_right.sol
rename to test/libsolidity/semanticTests/shifts/shift_negative_constant_right.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_negative_rvalue.sol b/test/libsolidity/semanticTests/shifts/shift_negative_rvalue.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_negative_rvalue.sol
rename to test/libsolidity/semanticTests/shifts/shift_negative_rvalue.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_negative_rvalue_assignment.sol b/test/libsolidity/semanticTests/shifts/shift_negative_rvalue_assignment.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_negative_rvalue_assignment.sol
rename to test/libsolidity/semanticTests/shifts/shift_negative_rvalue_assignment.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_overflow.sol b/test/libsolidity/semanticTests/shifts/shift_overflow.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_overflow.sol
rename to test/libsolidity/semanticTests/shifts/shift_overflow.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_right.sol b/test/libsolidity/semanticTests/shifts/shift_right.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_right.sol
rename to test/libsolidity/semanticTests/shifts/shift_right.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_right_assignment.sol b/test/libsolidity/semanticTests/shifts/shift_right_assignment.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_right_assignment.sol
rename to test/libsolidity/semanticTests/shifts/shift_right_assignment.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_right_assignment_signed.sol b/test/libsolidity/semanticTests/shifts/shift_right_assignment_signed.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_right_assignment_signed.sol
rename to test/libsolidity/semanticTests/shifts/shift_right_assignment_signed.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_right_negative_literal.sol b/test/libsolidity/semanticTests/shifts/shift_right_negative_literal.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_right_negative_literal.sol
rename to test/libsolidity/semanticTests/shifts/shift_right_negative_literal.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_right_negative_lvalue.sol b/test/libsolidity/semanticTests/shifts/shift_right_negative_lvalue.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_right_negative_lvalue.sol
rename to test/libsolidity/semanticTests/shifts/shift_right_negative_lvalue.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_right_negative_lvalue_assignment.sol b/test/libsolidity/semanticTests/shifts/shift_right_negative_lvalue_assignment.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_right_negative_lvalue_assignment.sol
rename to test/libsolidity/semanticTests/shifts/shift_right_negative_lvalue_assignment.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_right_negative_lvalue_int16.sol b/test/libsolidity/semanticTests/shifts/shift_right_negative_lvalue_int16.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_right_negative_lvalue_int16.sol
rename to test/libsolidity/semanticTests/shifts/shift_right_negative_lvalue_int16.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_right_negative_lvalue_int32.sol b/test/libsolidity/semanticTests/shifts/shift_right_negative_lvalue_int32.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_right_negative_lvalue_int32.sol
rename to test/libsolidity/semanticTests/shifts/shift_right_negative_lvalue_int32.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_right_negative_lvalue_int8.sol b/test/libsolidity/semanticTests/shifts/shift_right_negative_lvalue_int8.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_right_negative_lvalue_int8.sol
rename to test/libsolidity/semanticTests/shifts/shift_right_negative_lvalue_int8.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_right_uint32.sol b/test/libsolidity/semanticTests/shifts/shift_right_uint32.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_right_uint32.sol
rename to test/libsolidity/semanticTests/shifts/shift_right_uint32.sol
diff --git a/test/libsolidity/semanticTests/extracted/shift_right_uint8.sol b/test/libsolidity/semanticTests/shifts/shift_right_uint8.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/shift_right_uint8.sol
rename to test/libsolidity/semanticTests/shifts/shift_right_uint8.sol
diff --git a/test/libsolidity/semanticTests/shifts.sol b/test/libsolidity/semanticTests/shifts/shifts.sol
similarity index 100%
rename from test/libsolidity/semanticTests/shifts.sol
rename to test/libsolidity/semanticTests/shifts/shifts.sol
diff --git a/test/libsolidity/semanticTests/extracted/packed_functions.sol b/test/libsolidity/semanticTests/storage/packed_functions.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/packed_functions.sol
rename to test/libsolidity/semanticTests/storage/packed_functions.sol
diff --git a/test/libsolidity/semanticTests/extracted/packed_storage_overflow.sol b/test/libsolidity/semanticTests/storage/packed_storage_overflow.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/packed_storage_overflow.sol
rename to test/libsolidity/semanticTests/storage/packed_storage_overflow.sol
diff --git a/test/libsolidity/semanticTests/extracted/packed_storage_signed.sol b/test/libsolidity/semanticTests/storage/packed_storage_signed.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/packed_storage_signed.sol
rename to test/libsolidity/semanticTests/storage/packed_storage_signed.sol
diff --git a/test/libsolidity/semanticTests/extracted/packed_storage_structs_bytes.sol b/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/packed_storage_structs_bytes.sol
rename to test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
diff --git a/test/libsolidity/semanticTests/extracted/packed_storage_structs_enum.sol b/test/libsolidity/semanticTests/storage/packed_storage_structs_enum.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/packed_storage_structs_enum.sol
rename to test/libsolidity/semanticTests/storage/packed_storage_structs_enum.sol
diff --git a/test/libsolidity/semanticTests/extracted/packed_storage_structs_uint.sol b/test/libsolidity/semanticTests/storage/packed_storage_structs_uint.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/packed_storage_structs_uint.sol
rename to test/libsolidity/semanticTests/storage/packed_storage_structs_uint.sol
diff --git a/test/libsolidity/semanticTests/extracted/calldata_struct.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/calldata_struct.sol
rename to test/libsolidity/semanticTests/structs/calldata/calldata_struct.sol
diff --git a/test/libsolidity/semanticTests/extracted/calldata_struct_and_ints.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/calldata_struct_and_ints.sol
rename to test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol
diff --git a/test/libsolidity/semanticTests/extracted/calldata_struct_array_member.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/calldata_struct_array_member.sol
rename to test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member.sol
diff --git a/test/libsolidity/semanticTests/extracted/calldata_struct_to_memory.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/calldata_struct_to_memory.sol
rename to test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory.sol
diff --git a/test/libsolidity/semanticTests/extracted/calldata_structs.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_structs.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/calldata_structs.sol
rename to test/libsolidity/semanticTests/structs/calldata/calldata_structs.sol
diff --git a/test/libsolidity/semanticTests/extracted/lone_struct_array_type.sol b/test/libsolidity/semanticTests/structs/lone_struct_array_type.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/lone_struct_array_type.sol
rename to test/libsolidity/semanticTests/structs/lone_struct_array_type.sol
diff --git a/test/libsolidity/semanticTests/extracted/memory_structs_as_function_args.sol b/test/libsolidity/semanticTests/structs/memory_structs_as_function_args.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/memory_structs_as_function_args.sol
rename to test/libsolidity/semanticTests/structs/memory_structs_as_function_args.sol
diff --git a/test/libsolidity/semanticTests/extracted/memory_structs_nested.sol b/test/libsolidity/semanticTests/structs/memory_structs_nested.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/memory_structs_nested.sol
rename to test/libsolidity/semanticTests/structs/memory_structs_nested.sol
diff --git a/test/libsolidity/semanticTests/extracted/memory_structs_read_write.sol b/test/libsolidity/semanticTests/structs/memory_structs_read_write.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/memory_structs_read_write.sol
rename to test/libsolidity/semanticTests/structs/memory_structs_read_write.sol
diff --git a/test/libsolidity/semanticTests/extracted/memory_structs_with_mappings.sol b/test/libsolidity/semanticTests/structs/memory_structs_with_mappings.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/memory_structs_with_mappings.sol
rename to test/libsolidity/semanticTests/structs/memory_structs_with_mappings.sol
diff --git a/test/libsolidity/semanticTests/extracted/recursive_structs.sol b/test/libsolidity/semanticTests/structs/recursive_structs.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/recursive_structs.sol
rename to test/libsolidity/semanticTests/structs/recursive_structs.sol
diff --git a/test/libsolidity/semanticTests/extracted/struct_assign_reference_to_struct.sol b/test/libsolidity/semanticTests/structs/struct_assign_reference_to_struct.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/struct_assign_reference_to_struct.sol
rename to test/libsolidity/semanticTests/structs/struct_assign_reference_to_struct.sol
diff --git a/test/libsolidity/semanticTests/extracted/struct_copy.sol b/test/libsolidity/semanticTests/structs/struct_copy.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/struct_copy.sol
rename to test/libsolidity/semanticTests/structs/struct_copy.sol
diff --git a/test/libsolidity/semanticTests/extracted/struct_copy_via_local.sol b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/struct_copy_via_local.sol
rename to test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
diff --git a/test/libsolidity/semanticTests/extracted/struct_delete_member.sol b/test/libsolidity/semanticTests/structs/struct_delete_member.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/struct_delete_member.sol
rename to test/libsolidity/semanticTests/structs/struct_delete_member.sol
diff --git a/test/libsolidity/semanticTests/extracted/struct_delete_struct_in_mapping.sol b/test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/struct_delete_struct_in_mapping.sol
rename to test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol
diff --git a/test/libsolidity/semanticTests/extracted/struct_named_constructor.sol b/test/libsolidity/semanticTests/structs/struct_named_constructor.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/struct_named_constructor.sol
rename to test/libsolidity/semanticTests/structs/struct_named_constructor.sol
diff --git a/test/libsolidity/semanticTests/extracted/assignment_to_const_var_involving_expression.sol b/test/libsolidity/semanticTests/various/assignment_to_const_var_involving_expression.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/assignment_to_const_var_involving_expression.sol
rename to test/libsolidity/semanticTests/various/assignment_to_const_var_involving_expression.sol
diff --git a/test/libsolidity/semanticTests/extracted/balance.sol b/test/libsolidity/semanticTests/various/balance.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/balance.sol
rename to test/libsolidity/semanticTests/various/balance.sol
diff --git a/test/libsolidity/semanticTests/extracted/byte_optimization_bug.sol b/test/libsolidity/semanticTests/various/byte_optimization_bug.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/byte_optimization_bug.sol
rename to test/libsolidity/semanticTests/various/byte_optimization_bug.sol
diff --git a/test/libsolidity/semanticTests/extracted/code_access_content.sol b/test/libsolidity/semanticTests/various/code_access_content.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/code_access_content.sol
rename to test/libsolidity/semanticTests/various/code_access_content.sol
diff --git a/test/libsolidity/semanticTests/extracted/code_access_create.sol b/test/libsolidity/semanticTests/various/code_access_create.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/code_access_create.sol
rename to test/libsolidity/semanticTests/various/code_access_create.sol
diff --git a/test/libsolidity/semanticTests/extracted/code_access_padding.sol b/test/libsolidity/semanticTests/various/code_access_padding.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/code_access_padding.sol
rename to test/libsolidity/semanticTests/various/code_access_padding.sol
diff --git a/test/libsolidity/semanticTests/extracted/contract_binary_dependencies.sol b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/contract_binary_dependencies.sol
rename to test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
diff --git a/test/libsolidity/semanticTests/extracted/crazy_elementary_typenames_on_stack.sol b/test/libsolidity/semanticTests/various/crazy_elementary_typenames_on_stack.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/crazy_elementary_typenames_on_stack.sol
rename to test/libsolidity/semanticTests/various/crazy_elementary_typenames_on_stack.sol
diff --git a/test/libsolidity/semanticTests/extracted/cross_contract_types.sol b/test/libsolidity/semanticTests/various/cross_contract_types.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/cross_contract_types.sol
rename to test/libsolidity/semanticTests/various/cross_contract_types.sol
diff --git a/test/libsolidity/semanticTests/extracted/decayed_tuple.sol b/test/libsolidity/semanticTests/various/decayed_tuple.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/decayed_tuple.sol
rename to test/libsolidity/semanticTests/various/decayed_tuple.sol
diff --git a/test/libsolidity/semanticTests/extracted/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/destructuring_assignment.sol
rename to test/libsolidity/semanticTests/various/destructuring_assignment.sol
diff --git a/test/libsolidity/semanticTests/extracted/empty_name_return_parameter.sol b/test/libsolidity/semanticTests/various/empty_name_return_parameter.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/empty_name_return_parameter.sol
rename to test/libsolidity/semanticTests/various/empty_name_return_parameter.sol
diff --git a/test/libsolidity/semanticTests/extracted/external_types_in_calls.sol b/test/libsolidity/semanticTests/various/external_types_in_calls.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/external_types_in_calls.sol
rename to test/libsolidity/semanticTests/various/external_types_in_calls.sol
diff --git a/test/libsolidity/semanticTests/extracted/flipping_sign_tests.sol b/test/libsolidity/semanticTests/various/flipping_sign_tests.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/flipping_sign_tests.sol
rename to test/libsolidity/semanticTests/various/flipping_sign_tests.sol
diff --git a/test/libsolidity/semanticTests/extracted/gasleft_decrease.sol b/test/libsolidity/semanticTests/various/gasleft_decrease.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/gasleft_decrease.sol
rename to test/libsolidity/semanticTests/various/gasleft_decrease.sol
diff --git a/test/libsolidity/semanticTests/extracted/gasleft_shadow_resolution.sol b/test/libsolidity/semanticTests/various/gasleft_shadow_resolution.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/gasleft_shadow_resolution.sol
rename to test/libsolidity/semanticTests/various/gasleft_shadow_resolution.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_member_init.sol b/test/libsolidity/semanticTests/various/inline_member_init.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_member_init.sol
rename to test/libsolidity/semanticTests/various/inline_member_init.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_member_init_inheritence.sol b/test/libsolidity/semanticTests/various/inline_member_init_inheritence.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_member_init_inheritence.sol
rename to test/libsolidity/semanticTests/various/inline_member_init_inheritence.sol
diff --git a/test/libsolidity/semanticTests/extracted/inline_tuple_with_rational_numbers.sol b/test/libsolidity/semanticTests/various/inline_tuple_with_rational_numbers.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/inline_tuple_with_rational_numbers.sol
rename to test/libsolidity/semanticTests/various/inline_tuple_with_rational_numbers.sol
diff --git a/test/libsolidity/semanticTests/extracted/iszero_bnot_correct.sol b/test/libsolidity/semanticTests/various/iszero_bnot_correct.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/iszero_bnot_correct.sol
rename to test/libsolidity/semanticTests/various/iszero_bnot_correct.sol
diff --git a/test/libsolidity/semanticTests/extracted/literal_empty_string.sol b/test/libsolidity/semanticTests/various/literal_empty_string.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/literal_empty_string.sol
rename to test/libsolidity/semanticTests/various/literal_empty_string.sol
diff --git a/test/libsolidity/semanticTests/extracted/memory_overwrite.sol b/test/libsolidity/semanticTests/various/memory_overwrite.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/memory_overwrite.sol
rename to test/libsolidity/semanticTests/various/memory_overwrite.sol
diff --git a/test/libsolidity/semanticTests/extracted/multi_variable_declaration.sol b/test/libsolidity/semanticTests/various/multi_variable_declaration.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/multi_variable_declaration.sol
rename to test/libsolidity/semanticTests/various/multi_variable_declaration.sol
diff --git a/test/libsolidity/semanticTests/extracted/negative_stack_height.sol b/test/libsolidity/semanticTests/various/negative_stack_height.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/negative_stack_height.sol
rename to test/libsolidity/semanticTests/various/negative_stack_height.sol
diff --git a/test/libsolidity/semanticTests/extracted/nested_calldata_struct.sol b/test/libsolidity/semanticTests/various/nested_calldata_struct.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/nested_calldata_struct.sol
rename to test/libsolidity/semanticTests/various/nested_calldata_struct.sol
diff --git a/test/libsolidity/semanticTests/extracted/nested_calldata_struct_to_memory.sol b/test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/nested_calldata_struct_to_memory.sol
rename to test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol
diff --git a/test/libsolidity/semanticTests/extracted/positive_integers_to_signed.sol b/test/libsolidity/semanticTests/various/positive_integers_to_signed.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/positive_integers_to_signed.sol
rename to test/libsolidity/semanticTests/various/positive_integers_to_signed.sol
diff --git a/test/libsolidity/semanticTests/extracted/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/senders_balance.sol
rename to test/libsolidity/semanticTests/various/senders_balance.sol
diff --git a/test/libsolidity/semanticTests/extracted/single_copy_with_multiple_inheritance.sol b/test/libsolidity/semanticTests/various/single_copy_with_multiple_inheritance.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/single_copy_with_multiple_inheritance.sol
rename to test/libsolidity/semanticTests/various/single_copy_with_multiple_inheritance.sol
diff --git a/test/libsolidity/semanticTests/extracted/skip_dynamic_types.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/skip_dynamic_types.sol
rename to test/libsolidity/semanticTests/various/skip_dynamic_types.sol
diff --git a/test/libsolidity/semanticTests/extracted/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/skip_dynamic_types_for_structs.sol
rename to test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
diff --git a/test/libsolidity/semanticTests/extracted/state_variable_local_variable_mixture.sol b/test/libsolidity/semanticTests/various/state_variable_local_variable_mixture.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/state_variable_local_variable_mixture.sol
rename to test/libsolidity/semanticTests/various/state_variable_local_variable_mixture.sol
diff --git a/test/libsolidity/semanticTests/extracted/state_variable_under_contract_name.sol b/test/libsolidity/semanticTests/various/state_variable_under_contract_name.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/state_variable_under_contract_name.sol
rename to test/libsolidity/semanticTests/various/state_variable_under_contract_name.sol
diff --git a/test/libsolidity/semanticTests/extracted/storage_string_as_mapping_key_without_variable.sol b/test/libsolidity/semanticTests/various/storage_string_as_mapping_key_without_variable.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/storage_string_as_mapping_key_without_variable.sol
rename to test/libsolidity/semanticTests/various/storage_string_as_mapping_key_without_variable.sol
diff --git a/test/libsolidity/semanticTests/extracted/store_bytes.sol b/test/libsolidity/semanticTests/various/store_bytes.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/store_bytes.sol
rename to test/libsolidity/semanticTests/various/store_bytes.sol
diff --git a/test/libsolidity/semanticTests/extracted/string_tuples.sol b/test/libsolidity/semanticTests/various/string_tuples.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/string_tuples.sol
rename to test/libsolidity/semanticTests/various/string_tuples.sol
diff --git a/test/libsolidity/semanticTests/extracted/super.sol b/test/libsolidity/semanticTests/various/super.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/super.sol
rename to test/libsolidity/semanticTests/various/super.sol
diff --git a/test/libsolidity/semanticTests/extracted/super_alone.sol b/test/libsolidity/semanticTests/various/super_alone.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/super_alone.sol
rename to test/libsolidity/semanticTests/various/super_alone.sol
diff --git a/test/libsolidity/semanticTests/extracted/swap_in_storage_overwrite.sol b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/swap_in_storage_overwrite.sol
rename to test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
diff --git a/test/libsolidity/semanticTests/extracted/test_underscore_in_hex.sol b/test/libsolidity/semanticTests/various/test_underscore_in_hex.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/test_underscore_in_hex.sol
rename to test/libsolidity/semanticTests/various/test_underscore_in_hex.sol
diff --git a/test/libsolidity/semanticTests/extracted/tuples.sol b/test/libsolidity/semanticTests/various/tuples.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/tuples.sol
rename to test/libsolidity/semanticTests/various/tuples.sol
diff --git a/test/libsolidity/semanticTests/extracted/typed_multi_variable_declaration.sol b/test/libsolidity/semanticTests/various/typed_multi_variable_declaration.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/typed_multi_variable_declaration.sol
rename to test/libsolidity/semanticTests/various/typed_multi_variable_declaration.sol
diff --git a/test/libsolidity/semanticTests/extracted/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/value_complex.sol
rename to test/libsolidity/semanticTests/various/value_complex.sol
diff --git a/test/libsolidity/semanticTests/extracted/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/value_insane.sol
rename to test/libsolidity/semanticTests/various/value_insane.sol
diff --git a/test/libsolidity/semanticTests/extracted/write_storage_external.sol b/test/libsolidity/semanticTests/various/write_storage_external.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/write_storage_external.sol
rename to test/libsolidity/semanticTests/various/write_storage_external.sol
diff --git a/test/libsolidity/semanticTests/extracted/virtual_function_calls.sol b/test/libsolidity/semanticTests/virtualFunctions/virtual_function_calls.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/virtual_function_calls.sol
rename to test/libsolidity/semanticTests/virtualFunctions/virtual_function_calls.sol
diff --git a/test/libsolidity/semanticTests/extracted/virtual_function_usage_in_constructor_arguments.sol b/test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol
similarity index 100%
rename from test/libsolidity/semanticTests/extracted/virtual_function_usage_in_constructor_arguments.sol
rename to test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol