[libcxx-commits] [libcxx] [libc++] Move a bunch of tests into std/mem to reflect the standard (PR #99456)

[Nikolas Klauser via libcxx-commits]

https://github.com/philnik777 created https://github.com/llvm/llvm-project/pull/99456

Some time ago, a new top level stable name [mem] was introduced in the standard. This moves all the tests for this into the correct top level directory.


>From 2416524f67c8a1fa28640a1a6d604c05e1d66223 Mon Sep 17 00:00:00 2001
From: Nikolas Klauser <nikolasklauser at berlin.de>
Date: Thu, 18 Jul 2024 10:54:15 +0200
Subject: [PATCH] [libc++] Move a bunch of tests into std/mem to reflect the
 standard

---
 .../allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp     | 0
 .../allocator.adaptor.cnstr/converting_copy.pass.cpp              | 0
 .../allocator.adaptor.cnstr/converting_move.pass.cpp              | 0
 .../allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp       | 0
 .../allocator.adaptor/allocator.adaptor.cnstr/deduct.pass.cpp     | 0
 .../allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp    | 0
 .../allocator.adaptor.members/allocate_size.pass.cpp              | 0
 .../allocator.adaptor.members/allocate_size.verify.cpp            | 0
 .../allocator.adaptor.members/allocate_size_hint.pass.cpp         | 0
 .../allocator.adaptor.members/allocate_size_hint.verify.cpp       | 0
 .../allocator.adaptor.members/construct.pass.cpp                  | 0
 .../allocator.adaptor.members/construct_pair.pass.cpp             | 0
 .../construct_pair_const_lvalue_pair.pass.cpp                     | 0
 .../allocator.adaptor.members/construct_pair_piecewise.pass.cpp   | 0
 .../allocator.adaptor.members/construct_pair_rvalue.pass.cpp      | 0
 .../allocator.adaptor.members/construct_pair_values.pass.cpp      | 0
 .../allocator.adaptor.members/construct_type.pass.cpp             | 0
 .../allocator.adaptor.members/deallocate.pass.cpp                 | 0
 .../allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp  | 0
 .../allocator.adaptor.members/inner_allocator.pass.cpp            | 0
 .../allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp | 0
 .../allocator.adaptor.members/outer_allocator.pass.cpp            | 0
 .../select_on_container_copy_construction.pass.cpp                | 0
 .../allocator.adaptor.types/allocator_pointers.pass.cpp           | 0
 .../allocator.adaptor.types/inner_allocator_type.pass.cpp         | 0
 .../allocator.adaptor.types/is_always_equal.pass.cpp              | 0
 .../propagate_on_container_copy_assignment.pass.cpp               | 0
 .../propagate_on_container_move_assignment.pass.cpp               | 0
 .../allocator.adaptor.types/propagate_on_container_swap.pass.cpp  | 0
 .../allocator.adaptor/base-is-uglified.compile.pass.cpp           | 0
 .../scoped.adaptor.operators/copy_assign.pass.cpp                 | 0
 .../allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp        | 0
 .../scoped.adaptor.operators/move_assign.pass.cpp                 | 0
 .../{utilities => mem}/allocator.adaptor/types.compile.pass.cpp   | 0
 .../mem.poly.allocator.ctor/assign.pass.cpp                       | 0
 .../mem.poly.allocator.ctor/copy.pass.cpp                         | 0
 .../mem.poly.allocator.ctor/default.pass.cpp                      | 0
 .../mem.poly.allocator.ctor/memory_resource_convert.pass.cpp      | 0
 .../mem.poly.allocator.ctor/other_alloc.pass.cpp                  | 0
 .../mem.poly.allocator.class/mem.poly.allocator.eq/equal.pass.cpp | 0
 .../mem.poly.allocator.eq/not_equal.pass.cpp                      | 0
 .../mem.poly.allocator.mem/allocate.pass.cpp                      | 0
 .../mem.poly.allocator.mem/allocate_deallocate_bytes.pass.cpp     | 0
 .../mem.poly.allocator.mem/allocate_deallocate_object.pass.cpp    | 0
 .../allocate_deallocate_vocabulary.nodiscard.verify.cpp           | 0
 .../mem.poly.allocator.mem/construct_pair.pass.cpp                | 0
 .../construct_pair_const_lvalue_pair.pass.cpp                     | 0
 .../mem.poly.allocator.mem/construct_pair_rvalue.pass.cpp         | 0
 .../mem.poly.allocator.mem/construct_pair_values.pass.cpp         | 0
 .../mem.poly.allocator.mem/construct_piecewise_pair.pass.cpp      | 0
 .../mem.poly.allocator.mem/construct_piecewise_pair_evil.pass.cpp | 0
 .../mem.poly.allocator.mem/construct_types.pass.cpp               | 0
 .../mem.poly.allocator.mem/deallocate.pass.cpp                    | 0
 .../mem.poly.allocator.mem/default_type.compile.pass.cpp          | 0
 .../mem.poly.allocator.mem/destroy.pass.cpp                       | 0
 .../mem.poly.allocator.mem/new_delete_object.pass.cpp             | 0
 .../mem.poly.allocator.mem/resource.pass.cpp                      | 0
 .../select_on_container_copy_construction.pass.cpp                | 0
 .../mem.poly.allocator.mem/tracking_mem_res.h                     | 0
 .../mem.res/mem.res.aliases/header_deque_synop.pass.cpp           | 0
 .../mem.res/mem.res.aliases/header_deque_synop2.pass.cpp          | 0
 .../mem.res/mem.res.aliases/header_forward_list_synop.pass.cpp    | 0
 .../mem.res/mem.res.aliases/header_list_synop.pass.cpp            | 0
 .../mem.res/mem.res.aliases/header_list_synop2.pass.cpp           | 0
 .../mem.res/mem.res.aliases/header_map_synop.pass.cpp             | 0
 .../mem.res/mem.res.aliases/header_map_synop2.pass.cpp            | 0
 .../mem.res/mem.res.aliases/header_regex_synop.pass.cpp           | 0
 .../mem.res/mem.res.aliases/header_set_synop.pass.cpp             | 0
 .../mem.res/mem.res.aliases/header_set_synop2.pass.cpp            | 0
 .../mem.res/mem.res.aliases/header_string_synop.pass.cpp          | 0
 .../mem.res/mem.res.aliases/header_string_synop2.pass.cpp         | 0
 .../mem.res/mem.res.aliases/header_unordered_map_synop.pass.cpp   | 0
 .../mem.res/mem.res.aliases/header_unordered_map_synop2.pass.cpp  | 0
 .../mem.res/mem.res.aliases/header_unordered_set_synop.pass.cpp   | 0
 .../mem.res/mem.res.aliases/header_unordered_set_synop2.pass.cpp  | 0
 .../mem.res/mem.res.aliases/header_vector_synop.pass.cpp          | 0
 .../mem.res/mem.res.aliases/header_vector_synop2.pass.cpp         | 0
 .../mem.res/mem.res.global/default_resource.pass.cpp              | 0
 .../mem.res/mem.res.global/new_delete_resource.pass.cpp           | 0
 .../mem.res/mem.res.global/null_memory_resource.pass.cpp          | 0
 .../mem.res.monotonic.buffer.ctor/copy_move.pass.cpp              | 0
 .../mem.res.monotonic.buffer.ctor/with_default_resource.pass.cpp  | 0
 .../mem.res.monotonic.buffer.ctor/without_buffer.pass.cpp         | 0
 .../mem.res.monotonic.buffer.mem/allocate_deallocate.pass.cpp     | 0
 .../allocate_exception_safety.pass.cpp                            | 0
 .../allocate_from_initial_buffer.pass.cpp                         | 0
 .../allocate_from_zero_sized_buffer.pass.cpp                      | 0
 .../allocate_in_geometric_progression.pass.cpp                    | 0
 .../allocate_overaligned_request.pass.cpp                         | 0
 .../allocate_with_initial_size.pass.cpp                           | 0
 .../mem.res.monotonic.buffer.mem/equality.pass.cpp                | 0
 .../mem.res.pool.ctor/ctor_does_not_allocate.pass.cpp             | 0
 .../mem.res.pool.ctor/sync_with_default_resource.pass.cpp         | 0
 .../mem.res.pool.ctor/unsync_with_default_resource.pass.cpp       | 0
 .../mem.res/mem.res.pool/mem.res.pool.mem/equality.pass.cpp       | 0
 .../mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate.pass.cpp  | 0
 .../mem.res.pool.mem/sync_allocate_overaligned_request.pass.cpp   | 0
 .../mem.res.pool.mem/sync_allocate_reuse_blocks.pass.cpp          | 0
 .../mem.res.pool.mem/sync_deallocate_matches_allocate.pass.cpp    | 0
 .../mem.res.pool/mem.res.pool.mem/unsync_allocate.pass.cpp        | 0
 .../mem.res.pool.mem/unsync_allocate_overaligned_request.pass.cpp | 0
 .../mem.res.pool.mem/unsync_allocate_reuse_blocks.pass.cpp        | 0
 .../mem.res.pool.mem/unsync_deallocate_matches_allocate.pass.cpp  | 0
 .../utility => mem}/mem.res/mem.res/construct.verify.cpp          | 0
 .../utility => mem}/mem.res/mem.res/mem.res.eq/equal.pass.cpp     | 0
 .../utility => mem}/mem.res/mem.res/mem.res.eq/not_equal.pass.cpp | 0
 .../mem.res/mem.res/mem.res.private/private_members.verify.cpp    | 0
 .../mem.res/mem.res/mem.res.private/protected_members.verify.cpp  | 0
 .../mem.res/mem.res/mem.res.public/allocate.pass.cpp              | 0
 .../mem.res/mem.res/mem.res.public/deallocate.pass.cpp            | 0
 .../utility => mem}/mem.res/mem.res/mem.res.public/dtor.pass.cpp  | 0
 .../mem.res/mem.res/mem.res.public/is_equal.pass.cpp              | 0
 .../std/{utilities/utility => mem}/mem.res/nodiscard.verify.cpp   | 0
 .../memory/allocator.tag/allocator_arg.pass.cpp                   | 0
 .../memory/allocator.tag/allocator_arg.verify.cpp                 | 0
 .../allocator.traits/allocator.traits.members/allocate.pass.cpp   | 0
 .../allocator.traits/allocator.traits.members/allocate.verify.cpp | 0
 .../allocator.traits.members/allocate_at_least.pass.cpp           | 0
 .../allocator.traits.members/allocate_hint.pass.cpp               | 0
 .../allocator.traits/allocator.traits.members/construct.pass.cpp  | 0
 .../allocator.traits/allocator.traits.members/deallocate.pass.cpp | 0
 .../allocator.traits/allocator.traits.members/destroy.pass.cpp    | 0
 .../allocator.traits.members/incomplete_type_helper.h             | 0
 .../allocator.traits/allocator.traits.members/max_size.pass.cpp   | 0
 .../select_on_container_copy_construction.pass.cpp                | 0
 .../allocator.traits.types/const_pointer.pass.cpp                 | 0
 .../allocator.traits.types/const_void_pointer.pass.cpp            | 0
 .../allocator.traits.types/difference_type.pass.cpp               | 0
 .../allocator.traits.types/is_always_equal.pass.cpp               | 0
 .../allocator.traits/allocator.traits.types/pointer.pass.cpp      | 0
 .../propagate_on_container_copy_assignment.pass.cpp               | 0
 .../propagate_on_container_move_assignment.pass.cpp               | 0
 .../allocator.traits.types/propagate_on_container_swap.pass.cpp   | 0
 .../allocator.traits/allocator.traits.types/rebind_alloc.pass.cpp | 0
 .../allocator.traits/allocator.traits.types/size_type.pass.cpp    | 0
 .../allocator.traits/allocator.traits.types/void_pointer.pass.cpp | 0
 .../memory/allocator.traits/allocator_type.pass.cpp               | 0
 .../memory/allocator.traits/rebind_traits.pass.cpp                | 0
 .../memory/allocator.traits/value_type.pass.cpp                   | 0
 .../memory/allocator.uses/allocator.uses.construction/common.h    | 0
 .../allocator.uses.construction/make_obj_using_allocator.pass.cpp | 0
 .../uninitialized_construct_using_allocator.pass.cpp              | 0
 .../uses_allocator_construction_args.pass.cpp                     | 0
 .../allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp   | 0
 .../std/{utilities => mem}/memory/c.malloc/nothing_to_do.pass.cpp | 0
 .../memory/default.allocator/PR50299.compile.pass.cpp             | 0
 .../memory/default.allocator/allocator.ctor.pass.cpp              | 0
 .../memory/default.allocator/allocator.dtor.pass.cpp              | 0
 .../memory/default.allocator/allocator.globals/eq.pass.cpp        | 0
 .../allocator.members/allocate.constexpr.size.verify.cpp          | 0
 .../memory/default.allocator/allocator.members/allocate.pass.cpp  | 0
 .../default.allocator/allocator.members/allocate.size.pass.cpp    | 0
 .../default.allocator/allocator.members/allocate.verify.cpp       | 0
 .../allocator.members/allocate_at_least.pass.cpp                  | 0
 .../memory/default.allocator/allocator_pointers.pass.cpp          | 0
 .../allocator_types.deprecated_in_cxx17.verify.cpp                | 0
 .../allocator_types.deprecated_in_cxx23.verify.cpp                | 0
 .../memory/default.allocator/allocator_types.pass.cpp             | 0
 .../default.allocator/allocator_types.removed_in_cxx20.verify.cpp | 0
 .../default.allocator/allocator_types.removed_in_cxx26.verify.cpp | 0
 .../default.allocator/allocator_types.void.compile.pass.cpp       | 0
 .../memory/pointer.conversion/to_address.pass.cpp                 | 0
 .../memory/pointer.conversion/to_address_on_funcptr.verify.cpp    | 0
 .../memory/pointer.conversion/to_address_on_function.verify.cpp   | 0
 .../memory/pointer.conversion/to_address_std_iterators.pass.cpp   | 0
 .../pointer.conversion/to_address_without_pointer_traits.pass.cpp | 0
 .../pointer.traits/pointer.traits.functions/pointer_to.pass.cpp   | 0
 .../pointer.traits.types/difference_type.compile.pass.cpp         | 0
 .../pointer.traits.types/element_type.compile.pass.cpp            | 0
 .../pointer.traits/pointer.traits.types/lwg3545.compile.pass.cpp  | 0
 .../pointer.traits/pointer.traits.types/pointer.compile.pass.cpp  | 0
 .../pointer.traits/pointer.traits.types/rebind.compile.pass.cpp   | 0
 .../memory/pointer.traits/ptr.pointer_to.pass.cpp                 | 0
 .../memory/pointer.traits/ptr.types.compile.pass.cpp              | 0
 .../test/std/{utilities => mem}/memory/ptr.align/align.pass.cpp   | 0
 .../memory/ptr.align/assume_aligned.nodiscard.verify.cpp          | 0
 .../{utilities => mem}/memory/ptr.align/assume_aligned.pass.cpp   | 0
 .../std/{utilities => mem}/memory/specialized.algorithms/buffer.h | 0
 .../{utilities => mem}/memory/specialized.algorithms/counted.h    | 0
 .../memory/specialized.algorithms/overload_compare_iterator.h     | 0
 .../ranges_robust_against_nonbool.compile.pass.cpp                | 0
 .../specialized.addressof/addressof.pass.cpp                      | 0
 .../specialized.addressof/addressof.temp.compile.fail.cpp         | 0
 .../specialized.addressof/constexpr_addressof.pass.cpp            | 0
 .../specialized.construct/construct_at.pass.cpp                   | 0
 .../specialized.construct/ranges_construct_at.pass.cpp            | 0
 .../specialized.algorithms/specialized.destroy/destroy.pass.cpp   | 0
 .../specialized.destroy/destroy_at.pass.cpp                       | 0
 .../specialized.algorithms/specialized.destroy/destroy_n.pass.cpp | 0
 .../specialized.destroy/ranges_destroy.pass.cpp                   | 0
 .../specialized.destroy/ranges_destroy_at.pass.cpp                | 0
 .../specialized.destroy/ranges_destroy_n.pass.cpp                 | 0
 .../ranges_uninitialized_default_construct.pass.cpp               | 0
 .../ranges_uninitialized_default_construct_n.pass.cpp             | 0
 .../uninitialized_default_construct.pass.cpp                      | 0
 .../uninitialized_default_construct_n.pass.cpp                    | 0
 .../ranges_uninitialized_value_construct.pass.cpp                 | 0
 .../ranges_uninitialized_value_construct_n.pass.cpp               | 0
 .../uninitialized_value_construct.pass.cpp                        | 0
 .../uninitialized_value_construct_n.pass.cpp                      | 0
 .../uninitialized.copy/ranges_uninitialized_copy.pass.cpp         | 0
 .../uninitialized.copy/ranges_uninitialized_copy_n.pass.cpp       | 0
 .../uninitialized.copy/uninitialized_copy.pass.cpp                | 0
 .../uninitialized.copy/uninitialized_copy_n.pass.cpp              | 0
 .../uninitialized.fill.n/ranges_uninitialized_fill_n.pass.cpp     | 0
 .../uninitialized.fill.n/uninitialized_fill_n.pass.cpp            | 0
 .../uninitialized.fill/ranges_uninitialized_fill.pass.cpp         | 0
 .../uninitialized.fill/uninitialized_fill.pass.cpp                | 0
 .../uninitialized.move/ranges_uninitialized_move.pass.cpp         | 0
 .../uninitialized.move/ranges_uninitialized_move_n.pass.cpp       | 0
 .../uninitialized.move/uninitialized_move.pass.cpp                | 0
 .../uninitialized.move/uninitialized_move_n.pass.cpp              | 0
 .../memory/storage.iterator/deprecated.verify.cpp                 | 0
 .../memory/storage.iterator/raw_storage_iterator.base.pass.cpp    | 0
 .../memory/storage.iterator/raw_storage_iterator.pass.cpp         | 0
 .../memory/storage.iterator/types.compile.pass.cpp                | 0
 .../{utilities => mem}/memory/temporary.buffer/depr.verify.cpp    | 0
 .../memory/temporary.buffer/overaligned.pass.cpp                  | 0
 .../memory/temporary.buffer/temporary_buffer.pass.cpp             | 0
 .../unique.ptr/iterator_concept_conformance.compile.pass.cpp      | 0
 .../memory/unique.ptr/unique.ptr.special/io.pass.cpp              | 0
 .../memory/unique.ptr/unique.ptr.special/io.verify.cpp            | 0
 .../util.smartptr.enab/enable_shared_from_this.pass.cpp           | 0
 .../memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp | 0
 .../util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp     | 0
 .../util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp     | 0
 .../atomic_compare_exchange_strong.pass.cpp                       | 0
 .../atomic_compare_exchange_strong_explicit.pass.cpp              | 0
 .../atomic_compare_exchange_weak.pass.cpp                         | 0
 .../atomic_compare_exchange_weak_explicit.pass.cpp                | 0
 .../util.smartptr.shared.atomic/atomic_exchange.pass.cpp          | 0
 .../util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp | 0
 .../util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp      | 0
 .../util.smartptr.shared.atomic/atomic_load.pass.cpp              | 0
 .../util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp     | 0
 .../util.smartptr.shared.atomic/atomic_store.pass.cpp             | 0
 .../util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp    | 0
 .../iterator_concept_conformance.compile.pass.cpp                 | 0
 .../memory/util.smartptr/util.smartptr.shared/types.pass.cpp      | 0
 .../util.smartptr.getdeleter/get_deleter.pass.cpp                 | 0
 .../util.smartptr.shared.assign/auto_ptr_Y.pass.cpp               | 0
 .../util.smartptr.shared.assign/shared_ptr.pass.cpp               | 0
 .../util.smartptr.shared.assign/shared_ptr_Y.pass.cpp             | 0
 .../util.smartptr.shared.assign/shared_ptr_Y_rv.pass.cpp          | 0
 .../util.smartptr.shared.assign/shared_ptr_rv.pass.cpp            | 0
 .../util.smartptr.shared.assign/unique_ptr_Y.pass.cpp             | 0
 .../util.smartptr.shared.cast/const_pointer_cast.pass.cpp         | 0
 .../util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp       | 0
 .../util.smartptr.shared.cast/reinterpret_pointer_cast.pass.cpp   | 0
 .../util.smartptr.shared.cast/static_pointer_cast.pass.cpp        | 0
 .../util.smartptr.shared/util.smartptr.shared.cmp/cmp.pass.cpp    | 0
 .../util.smartptr.shared.cmp/cmp_nullptr.pass.cpp                 | 0
 .../util.smartptr.shared.const/auto_ptr.pass.cpp                  | 0
 .../util.smartptr.shared.const/deduction.pass.cpp                 | 0
 .../util.smartptr.shared.const/default.pass.cpp                   | 0
 .../util.smartptr.shared.const/nullptr_t.pass.cpp                 | 0
 .../util.smartptr.shared.const/nullptr_t_deleter.pass.cpp         | 0
 .../nullptr_t_deleter_allocator.pass.cpp                          | 0
 .../nullptr_t_deleter_allocator_throw.pass.cpp                    | 0
 .../util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp   | 0
 .../util.smartptr.shared.const/pointer.pass.cpp                   | 0
 .../util.smartptr.shared.const/pointer_deleter.pass.cpp           | 0
 .../util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp | 0
 .../pointer_deleter_allocator_throw.pass.cpp                      | 0
 .../util.smartptr.shared.const/pointer_deleter_throw.pass.cpp     | 0
 .../util.smartptr.shared.const/pointer_throw.pass.cpp             | 0
 .../util.smartptr.shared.const/shared_ptr.pass.cpp                | 0
 .../util.smartptr.shared.const/shared_ptr_Y.pass.cpp              | 0
 .../util.smartptr.shared.const/shared_ptr_Y_rv.pass.cpp           | 0
 .../util.smartptr.shared.const/shared_ptr_copy_move.verify.cpp    | 0
 .../util.smartptr.shared.const/shared_ptr_pointer.pass.cpp        | 0
 .../util.smartptr.shared.const/shared_ptr_rv.pass.cpp             | 0
 .../util.smartptr.shared/util.smartptr.shared.const/types.h       | 0
 .../util.smartptr.shared.const/unique_ptr.pass.cpp                | 0
 .../util.smartptr.shared.const/weak_ptr.pass.cpp                  | 0
 .../allocate_shared.array.bounded.pass.cpp                        | 0
 .../allocate_shared.array.unbounded.pass.cpp                      | 0
 .../allocate_shared.explicit_conversion.pass.cpp                  | 0
 .../util.smartptr.shared.create/allocate_shared.lwg2070.pass.cpp  | 0
 .../util.smartptr.shared.create/allocate_shared.pass.cpp          | 0
 .../allocate_shared_for_overwrite.pass.cpp                        | 0
 .../make_shared.array.bounded.pass.cpp                            | 0
 .../make_shared.array.unbounded.pass.cpp                          | 0
 .../util.smartptr.shared.create/make_shared.pass.cpp              | 0
 .../make_shared.private.compile.fail.cpp                          | 0
 .../make_shared_for_overwrite.pass.cpp                            | 0
 .../util.smartptr.shared/util.smartptr.shared.create/types.h      | 0
 .../util.smartptr.shared.dest/tested_elsewhere.pass.cpp           | 0
 .../util.smartptr.shared/util.smartptr.shared.io/io.pass.cpp      | 0
 .../util.smartptr.shared/util.smartptr.shared.mod/reset.pass.cpp  | 0
 .../util.smartptr.shared/util.smartptr.shared.mod/reset_helper.h  | 0
 .../util.smartptr.shared.mod/reset_pointer.pass.cpp               | 0
 .../util.smartptr.shared.mod/reset_pointer_deleter.pass.cpp       | 0
 .../reset_pointer_deleter_allocator.pass.cpp                      | 0
 .../util.smartptr.shared/util.smartptr.shared.mod/swap.pass.cpp   | 0
 .../util.smartptr.shared/util.smartptr.shared.obs/arrow.pass.cpp  | 0
 .../util.smartptr.shared.obs/dereference.pass.cpp                 | 0
 .../util.smartptr.shared.obs/op_arrow.verify.cpp                  | 0
 .../util.smartptr.shared.obs/op_bool.pass.cpp                     | 0
 .../util.smartptr.shared.obs/op_bracket.pass.cpp                  | 0
 .../util.smartptr.shared.obs/op_bracket.verify.cpp                | 0
 .../util.smartptr.shared.obs/owner_before_shared_ptr.pass.cpp     | 0
 .../util.smartptr.shared.obs/owner_before_weak_ptr.pass.cpp       | 0
 .../unique.deprecated_in_cxx17.verify.cpp                         | 0
 .../util.smartptr.shared/util.smartptr.shared.obs/unique.pass.cpp | 0
 .../util.smartptr.shared.obs/unique.removed_in_cxx20.verify.cpp   | 0
 .../util.smartptr.shared/util.smartptr.shared.spec/swap.pass.cpp  | 0
 .../memory/util.smartptr/util.smartptr.weak/types.pass.cpp        | 0
 .../util.smartptr.ownerless/owner_less.pass.cpp                   | 0
 .../util.smartptr.weak.assign/shared_ptr_Y.pass.cpp               | 0
 .../util.smartptr.weak.assign/weak_ptr.pass.cpp                   | 0
 .../util.smartptr.weak.assign/weak_ptr_Y.pass.cpp                 | 0
 .../util.smartptr.weak/util.smartptr.weak.const/default.pass.cpp  | 0
 .../util.smartptr.weak/util.smartptr.weak.const/pr40459.pass.cpp  | 0
 .../util.smartptr.weak.const/shared_ptr_Y.pass.cpp                | 0
 .../util.smartptr.weak.const/shared_ptr_deduction.pass.cpp        | 0
 .../util.smartptr.weak/util.smartptr.weak.const/weak_ptr.pass.cpp | 0
 .../util.smartptr.weak.const/weak_ptr_Y.pass.cpp                  | 0
 .../util.smartptr.weak.dest/tested_elsewhere.pass.cpp             | 0
 .../util.smartptr.weak/util.smartptr.weak.mod/reset.pass.cpp      | 0
 .../util.smartptr.weak/util.smartptr.weak.mod/swap.pass.cpp       | 0
 .../util.smartptr.weak/util.smartptr.weak.obs/expired.pass.cpp    | 0
 .../util.smartptr.weak/util.smartptr.weak.obs/lock.pass.cpp       | 0
 .../util.smartptr.weak.obs/not_less_than.compile.fail.cpp         | 0
 .../util.smartptr.weak.obs/owner_before_shared_ptr.pass.cpp       | 0
 .../util.smartptr.weak.obs/owner_before_weak_ptr.pass.cpp         | 0
 .../util.smartptr.weak/util.smartptr.weak.spec/swap.pass.cpp      | 0
 .../util.smartptr/util.smartptr.weakptr/bad_weak_ptr.pass.cpp     | 0
 libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/README.TXT | 0
 .../smartptr/unique.ptr/unique.ptr.class/pointer_type.pass.cpp    | 0
 .../unique.ptr/unique.ptr.class/unique.ptr.asgn/move.pass.cpp     | 0
 .../unique.ptr.class/unique.ptr.asgn/move_convert.pass.cpp        | 0
 .../unique.ptr.asgn/move_convert.runtime.pass.cpp                 | 0
 .../unique.ptr.class/unique.ptr.asgn/move_convert.single.pass.cpp | 0
 .../unique.ptr/unique.ptr.class/unique.ptr.asgn/null.pass.cpp     | 0
 .../unique.ptr/unique.ptr.class/unique.ptr.asgn/nullptr.pass.cpp  | 0
 .../unique.ptr.class/unique.ptr.ctor/auto_pointer.pass.cpp        | 0
 .../unique.ptr/unique.ptr.class/unique.ptr.ctor/deduct.pass.cpp   | 0
 .../unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp  | 0
 .../unique.ptr/unique.ptr.class/unique.ptr.ctor/move.pass.cpp     | 0
 .../unique.ptr.class/unique.ptr.ctor/move_convert.pass.cpp        | 0
 .../unique.ptr.ctor/move_convert.runtime.pass.cpp                 | 0
 .../unique.ptr.class/unique.ptr.ctor/move_convert.single.pass.cpp | 0
 .../unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp  | 0
 .../unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer.pass.cpp  | 0
 .../unique.ptr.class/unique.ptr.ctor/pointer_deleter.pass.cpp     | 0
 .../unique.ptr.class/unique.ptr.ctor/pointer_deleter.verify.cpp   | 0
 .../unique.ptr/unique.ptr.class/unique.ptr.dtor/null.pass.cpp     | 0
 .../unique.ptr.class/unique.ptr.modifiers/release.pass.cpp        | 0
 .../unique.ptr.class/unique.ptr.modifiers/reset.pass.cpp          | 0
 .../unique.ptr.modifiers/reset.runtime.verify.cpp                 | 0
 .../unique.ptr.class/unique.ptr.modifiers/reset.single.pass.cpp   | 0
 .../unique.ptr.class/unique.ptr.modifiers/reset_self.pass.cpp     | 0
 .../unique.ptr.class/unique.ptr.modifiers/swap.pass.cpp           | 0
 .../unique.ptr.observers/dereference.single.pass.cpp              | 0
 .../unique.ptr.class/unique.ptr.observers/dereference.verify.cpp  | 0
 .../unique.ptr.class/unique.ptr.observers/explicit_bool.pass.cpp  | 0
 .../unique.ptr/unique.ptr.class/unique.ptr.observers/get.pass.cpp | 0
 .../unique.ptr.class/unique.ptr.observers/get_deleter.pass.cpp    | 0
 .../unique.ptr.observers/op_arrow.single.pass.cpp                 | 0
 .../unique.ptr.class/unique.ptr.observers/op_arrow.verify.cpp     | 0
 .../unique.ptr.observers/op_subscript.runtime.pass.cpp            | 0
 .../unique.ptr.observers/op_subscript.single.verify.cpp           | 0
 .../unique.ptr/unique.ptr.create/make_unique.array.pass.cpp       | 0
 .../unique.ptr.create/make_unique.array1.compile.fail.cpp         | 0
 .../unique.ptr.create/make_unique.array2.compile.fail.cpp         | 0
 .../unique.ptr.create/make_unique.array3.compile.fail.cpp         | 0
 .../unique.ptr.create/make_unique.array4.compile.fail.cpp         | 0
 .../unique.ptr/unique.ptr.create/make_unique.single.pass.cpp      | 0
 .../unique.ptr/unique.ptr.create/make_unique.sizezero.pass.cpp    | 0
 .../make_unique_for_overwrite.default_init.pass.cpp               | 0
 .../unique.ptr.create/make_unique_for_overwrite.pass.cpp          | 0
 .../unique.ptr.dltr/unique.ptr.dltr.dflt/convert_ctor.pass.cpp    | 0
 .../unique.ptr.dltr/unique.ptr.dltr.dflt/default.pass.cpp         | 0
 .../unique.ptr.dltr.dflt/incomplete.compile.fail.cpp              | 0
 .../unique.ptr.dltr/unique.ptr.dltr.dflt/void.compile.fail.cpp    | 0
 .../unique.ptr.dltr.dflt1/convert_ctor.compile.fail.cpp           | 0
 .../unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.pass.cpp   | 0
 .../unique.ptr.dltr/unique.ptr.dltr.dflt1/default.pass.cpp        | 0
 .../unique.ptr.dltr.dflt1/incomplete.compile.fail.cpp             | 0
 .../unique.ptr.dltr.general/nothing_to_do.pass.cpp                | 0
 .../smartptr/unique.ptr/unique.ptr.special/cmp.pass.cpp           | 0
 .../smartptr/unique.ptr/unique.ptr.special/cmp_nullptr.pass.cpp   | 0
 .../smartptr/unique.ptr/unique.ptr.special/swap.pass.cpp          | 0
 384 files changed, 0 insertions(+), 0 deletions(-)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.cnstr/deduct.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/allocate_size.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.types/is_always_equal.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/base-is-uglified.compile.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/scoped.adaptor.operators/copy_assign.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/scoped.adaptor.operators/move_assign.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/allocator.adaptor/types.compile.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/assign.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/copy.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/default.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/memory_resource_convert.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/other_alloc.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.eq/equal.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.eq/not_equal.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate_deallocate_bytes.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate_deallocate_object.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate_deallocate_vocabulary.nodiscard.verify.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair_const_lvalue_pair.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair_rvalue.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair_values.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_piecewise_pair.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_piecewise_pair_evil.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_types.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/deallocate.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/default_type.compile.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/destroy.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/new_delete_object.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/resource.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/select_on_container_copy_construction.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/tracking_mem_res.h (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_deque_synop.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_deque_synop2.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_forward_list_synop.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_list_synop.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_list_synop2.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_map_synop.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_map_synop2.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_regex_synop.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_set_synop.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_set_synop2.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_string_synop.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_string_synop2.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_unordered_map_synop.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_unordered_map_synop2.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_unordered_set_synop.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_unordered_set_synop2.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_vector_synop.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.aliases/header_vector_synop2.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.global/default_resource.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.global/new_delete_resource.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.global/null_memory_resource.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/copy_move.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/with_default_resource.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/without_buffer.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_deallocate.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_exception_safety.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_from_initial_buffer.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_from_zero_sized_buffer.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_in_geometric_progression.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_overaligned_request.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_with_initial_size.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/equality.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.pool/mem.res.pool.ctor/ctor_does_not_allocate.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.pool/mem.res.pool.ctor/sync_with_default_resource.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.pool/mem.res.pool.ctor/unsync_with_default_resource.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.pool/mem.res.pool.mem/equality.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate_overaligned_request.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate_reuse_blocks.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.pool/mem.res.pool.mem/sync_deallocate_matches_allocate.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_overaligned_request.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_reuse_blocks.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res.pool/mem.res.pool.mem/unsync_deallocate_matches_allocate.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res/construct.verify.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res/mem.res.eq/equal.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res/mem.res.eq/not_equal.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res/mem.res.private/private_members.verify.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res/mem.res.private/protected_members.verify.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res/mem.res.public/allocate.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res/mem.res.public/deallocate.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res/mem.res.public/dtor.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/mem.res/mem.res.public/is_equal.pass.cpp (100%)
 rename libcxx/test/std/{utilities/utility => mem}/mem.res/nodiscard.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.tag/allocator_arg.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.tag/allocator_arg.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.members/allocate.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.members/allocate_at_least.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.members/allocate_hint.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.members/construct.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.members/destroy.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.members/incomplete_type_helper.h (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.members/select_on_container_copy_construction.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.types/const_pointer.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.types/const_void_pointer.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.types/difference_type.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.types/is_always_equal.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.types/pointer.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.types/propagate_on_container_copy_assignment.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.types/propagate_on_container_move_assignment.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.types/propagate_on_container_swap.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.types/rebind_alloc.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.types/size_type.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator.traits.types/void_pointer.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/allocator_type.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/rebind_traits.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.traits/value_type.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.uses/allocator.uses.construction/common.h (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.uses/allocator.uses.construction/make_obj_using_allocator.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.uses/allocator.uses.construction/uninitialized_construct_using_allocator.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/c.malloc/nothing_to_do.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/default.allocator/PR50299.compile.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/default.allocator/allocator.ctor.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/default.allocator/allocator.dtor.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/default.allocator/allocator.globals/eq.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/default.allocator/allocator.members/allocate.constexpr.size.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/default.allocator/allocator.members/allocate.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/default.allocator/allocator.members/allocate.size.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/default.allocator/allocator.members/allocate.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/default.allocator/allocator.members/allocate_at_least.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/default.allocator/allocator_pointers.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/default.allocator/allocator_types.deprecated_in_cxx17.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/default.allocator/allocator_types.deprecated_in_cxx23.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/default.allocator/allocator_types.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/default.allocator/allocator_types.removed_in_cxx20.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/default.allocator/allocator_types.removed_in_cxx26.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/default.allocator/allocator_types.void.compile.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/pointer.conversion/to_address.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/pointer.conversion/to_address_on_funcptr.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/pointer.conversion/to_address_on_function.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/pointer.conversion/to_address_std_iterators.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/pointer.conversion/to_address_without_pointer_traits.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/pointer.traits/pointer.traits.functions/pointer_to.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/pointer.traits/pointer.traits.types/difference_type.compile.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/pointer.traits/pointer.traits.types/element_type.compile.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/pointer.traits/pointer.traits.types/lwg3545.compile.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/pointer.traits/pointer.traits.types/pointer.compile.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/pointer.traits/pointer.traits.types/rebind.compile.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/pointer.traits/ptr.pointer_to.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/pointer.traits/ptr.types.compile.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/ptr.align/align.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/ptr.align/assume_aligned.nodiscard.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/ptr.align/assume_aligned.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/buffer.h (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/counted.h (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/overload_compare_iterator.h (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/ranges_robust_against_nonbool.compile.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/specialized.addressof/addressof.temp.compile.fail.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/specialized.addressof/constexpr_addressof.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/specialized.construct/construct_at.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/specialized.construct/ranges_construct_at.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/specialized.destroy/destroy.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/specialized.destroy/destroy_at.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/specialized.destroy/destroy_n.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/specialized.destroy/ranges_destroy.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/specialized.destroy/ranges_destroy_at.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/specialized.destroy/ranges_destroy_n.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.construct.default/ranges_uninitialized_default_construct.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.construct.default/ranges_uninitialized_default_construct_n.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.construct.value/ranges_uninitialized_value_construct.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.construct.value/ranges_uninitialized_value_construct_n.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct_n.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.copy/ranges_uninitialized_copy.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.copy/ranges_uninitialized_copy_n.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy_n.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.fill.n/ranges_uninitialized_fill_n.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.fill.n/uninitialized_fill_n.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.fill/ranges_uninitialized_fill.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.fill/uninitialized_fill.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.move/ranges_uninitialized_move.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.move/ranges_uninitialized_move_n.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/storage.iterator/deprecated.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/storage.iterator/raw_storage_iterator.base.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/storage.iterator/raw_storage_iterator.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/storage.iterator/types.compile.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/temporary.buffer/depr.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/temporary.buffer/overaligned.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/temporary.buffer/temporary_buffer.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/unique.ptr/iterator_concept_conformance.compile.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/unique.ptr/unique.ptr.special/io.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/unique.ptr/unique.ptr.special/io.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/iterator_concept_conformance.compile.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/types.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/auto_ptr_Y.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y_rv.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_rv.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/unique_ptr_Y.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/const_pointer_cast.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/reinterpret_pointer_cast.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/static_pointer_cast.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp_nullptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/deduction.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/default.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y_rv.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_copy_move.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_pointer.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_rv.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/types.h (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/weak_ptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.array.bounded.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.array.unbounded.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.explicit_conversion.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.lwg2070.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_for_overwrite.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.array.bounded.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.array.unbounded.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.private.compile.fail.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared_for_overwrite.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/types.h (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.dest/tested_elsewhere.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/io.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_helper.h (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/swap.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/arrow.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/dereference.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_arrow.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bool.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bracket.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bracket.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_shared_ptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_weak_ptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.deprecated_in_cxx17.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.removed_in_cxx20.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/swap.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/types.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/owner_less.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/shared_ptr_Y.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr_Y.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/default.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/pr40459.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_Y.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_deduction.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr_Y.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.dest/tested_elsewhere.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/reset.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/swap.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/expired.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/lock.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/not_less_than.compile.fail.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_shared_ptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_weak_ptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/swap.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/memory/util.smartptr/util.smartptr.weakptr/bad_weak_ptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/README.TXT (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/pointer_type.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.runtime.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.single.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/null.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/nullptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/auto_pointer.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/deduct.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.runtime.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.single.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer_deleter.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer_deleter.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.dtor/null.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/release.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.runtime.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.single.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset_self.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/swap.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/dereference.single.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/dereference.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/explicit_bool.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/get.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/get_deleter.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_arrow.single.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_arrow.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.runtime.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.single.verify.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.create/make_unique.array.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.create/make_unique.array1.compile.fail.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.create/make_unique.array2.compile.fail.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.create/make_unique.array3.compile.fail.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.create/make_unique.array4.compile.fail.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.create/make_unique.single.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.create/make_unique.sizezero.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.create/make_unique_for_overwrite.default_init.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.create/make_unique_for_overwrite.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/convert_ctor.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/default.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/incomplete.compile.fail.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/void.compile.fail.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.compile.fail.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/default.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/incomplete.compile.fail.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.general/nothing_to_do.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.special/cmp.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.special/cmp_nullptr.pass.cpp (100%)
 rename libcxx/test/std/{utilities => mem}/smartptr/unique.ptr/unique.ptr.special/swap.pass.cpp (100%)

diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/deduct.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.cnstr/deduct.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/deduct.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.cnstr/deduct.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.verify.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/allocate_size.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.verify.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/allocate_size.verify.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.verify.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.verify.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.verify.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/is_always_equal.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.types/is_always_equal.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/is_always_equal.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.types/is_always_equal.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/base-is-uglified.compile.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/base-is-uglified.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/base-is-uglified.compile.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/base-is-uglified.compile.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/copy_assign.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/scoped.adaptor.operators/copy_assign.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/copy_assign.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/scoped.adaptor.operators/copy_assign.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/move_assign.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/scoped.adaptor.operators/move_assign.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/scoped.adaptor.operators/move_assign.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/scoped.adaptor.operators/move_assign.pass.cpp
diff --git a/libcxx/test/std/utilities/allocator.adaptor/types.compile.pass.cpp b/libcxx/test/std/mem/allocator.adaptor/types.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/allocator.adaptor/types.compile.pass.cpp
rename to libcxx/test/std/mem/allocator.adaptor/types.compile.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/assign.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/assign.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/assign.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/assign.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/copy.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/copy.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/copy.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/copy.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/default.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/default.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/default.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/default.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/memory_resource_convert.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/memory_resource_convert.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/memory_resource_convert.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/memory_resource_convert.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/other_alloc.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/other_alloc.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/other_alloc.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.ctor/other_alloc.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.eq/equal.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.eq/equal.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.eq/equal.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.eq/equal.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.eq/not_equal.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.eq/not_equal.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.eq/not_equal.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.eq/not_equal.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate_deallocate_bytes.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate_deallocate_bytes.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate_deallocate_bytes.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate_deallocate_bytes.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate_deallocate_object.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate_deallocate_object.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate_deallocate_object.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate_deallocate_object.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate_deallocate_vocabulary.nodiscard.verify.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate_deallocate_vocabulary.nodiscard.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate_deallocate_vocabulary.nodiscard.verify.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/allocate_deallocate_vocabulary.nodiscard.verify.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair_const_lvalue_pair.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair_const_lvalue_pair.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair_const_lvalue_pair.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair_const_lvalue_pair.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair_rvalue.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair_rvalue.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair_rvalue.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair_rvalue.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair_values.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair_values.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair_values.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_pair_values.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_piecewise_pair.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_piecewise_pair.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_piecewise_pair.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_piecewise_pair.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_piecewise_pair_evil.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_piecewise_pair_evil.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_piecewise_pair_evil.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_piecewise_pair_evil.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_types.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_types.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_types.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/construct_types.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/deallocate.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/deallocate.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/deallocate.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/deallocate.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/default_type.compile.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/default_type.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/default_type.compile.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/default_type.compile.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/destroy.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/destroy.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/destroy.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/destroy.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/new_delete_object.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/new_delete_object.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/new_delete_object.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/new_delete_object.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/resource.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/resource.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/resource.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/resource.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/select_on_container_copy_construction.pass.cpp b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/select_on_container_copy_construction.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/select_on_container_copy_construction.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/select_on_container_copy_construction.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/tracking_mem_res.h b/libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/tracking_mem_res.h
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/tracking_mem_res.h
rename to libcxx/test/std/mem/mem.res/mem.poly.allocator.class/mem.poly.allocator.mem/tracking_mem_res.h
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_deque_synop.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_deque_synop.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_deque_synop.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_deque_synop.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_deque_synop2.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_deque_synop2.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_deque_synop2.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_deque_synop2.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_forward_list_synop.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_forward_list_synop.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_forward_list_synop.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_forward_list_synop.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_list_synop.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_list_synop.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_list_synop.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_list_synop.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_list_synop2.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_list_synop2.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_list_synop2.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_list_synop2.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_map_synop.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_map_synop.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_map_synop.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_map_synop.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_map_synop2.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_map_synop2.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_map_synop2.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_map_synop2.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_regex_synop.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_regex_synop.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_regex_synop.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_regex_synop.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_set_synop.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_set_synop.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_set_synop.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_set_synop.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_set_synop2.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_set_synop2.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_set_synop2.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_set_synop2.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_string_synop.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_string_synop.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_string_synop.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_string_synop.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_string_synop2.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_string_synop2.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_string_synop2.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_string_synop2.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_unordered_map_synop.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_unordered_map_synop.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_unordered_map_synop.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_unordered_map_synop.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_unordered_map_synop2.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_unordered_map_synop2.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_unordered_map_synop2.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_unordered_map_synop2.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_unordered_set_synop.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_unordered_set_synop.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_unordered_set_synop.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_unordered_set_synop.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_unordered_set_synop2.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_unordered_set_synop2.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_unordered_set_synop2.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_unordered_set_synop2.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_vector_synop.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_vector_synop.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_vector_synop.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_vector_synop.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_vector_synop2.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.aliases/header_vector_synop2.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.aliases/header_vector_synop2.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.aliases/header_vector_synop2.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.global/default_resource.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.global/default_resource.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.global/default_resource.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.global/default_resource.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.global/new_delete_resource.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.global/new_delete_resource.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.global/new_delete_resource.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.global/new_delete_resource.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.global/null_memory_resource.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.global/null_memory_resource.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.global/null_memory_resource.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.global/null_memory_resource.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/copy_move.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/copy_move.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/copy_move.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/copy_move.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/with_default_resource.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/with_default_resource.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/with_default_resource.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/with_default_resource.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/without_buffer.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/without_buffer.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/without_buffer.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.ctor/without_buffer.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_deallocate.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_deallocate.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_deallocate.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_deallocate.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_exception_safety.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_exception_safety.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_exception_safety.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_exception_safety.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_from_initial_buffer.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_from_initial_buffer.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_from_initial_buffer.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_from_initial_buffer.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_from_zero_sized_buffer.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_from_zero_sized_buffer.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_from_zero_sized_buffer.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_from_zero_sized_buffer.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_in_geometric_progression.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_in_geometric_progression.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_in_geometric_progression.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_in_geometric_progression.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_overaligned_request.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_overaligned_request.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_overaligned_request.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_overaligned_request.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_with_initial_size.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_with_initial_size.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_with_initial_size.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/allocate_with_initial_size.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/equality.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/equality.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/equality.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.monotonic.buffer/mem.res.monotonic.buffer.mem/equality.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.ctor/ctor_does_not_allocate.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.ctor/ctor_does_not_allocate.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.ctor/ctor_does_not_allocate.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.ctor/ctor_does_not_allocate.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.ctor/sync_with_default_resource.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.ctor/sync_with_default_resource.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.ctor/sync_with_default_resource.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.ctor/sync_with_default_resource.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.ctor/unsync_with_default_resource.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.ctor/unsync_with_default_resource.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.ctor/unsync_with_default_resource.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.ctor/unsync_with_default_resource.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/equality.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/equality.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/equality.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/equality.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate_overaligned_request.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate_overaligned_request.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate_overaligned_request.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate_overaligned_request.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate_reuse_blocks.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate_reuse_blocks.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate_reuse_blocks.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/sync_allocate_reuse_blocks.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/sync_deallocate_matches_allocate.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/sync_deallocate_matches_allocate.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/sync_deallocate_matches_allocate.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/sync_deallocate_matches_allocate.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_overaligned_request.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_overaligned_request.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_overaligned_request.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_overaligned_request.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_reuse_blocks.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_reuse_blocks.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_reuse_blocks.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_reuse_blocks.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_deallocate_matches_allocate.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/unsync_deallocate_matches_allocate.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_deallocate_matches_allocate.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res.pool/mem.res.pool.mem/unsync_deallocate_matches_allocate.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res/construct.verify.cpp b/libcxx/test/std/mem/mem.res/mem.res/construct.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res/construct.verify.cpp
rename to libcxx/test/std/mem/mem.res/mem.res/construct.verify.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.eq/equal.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res/mem.res.eq/equal.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.eq/equal.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res/mem.res.eq/equal.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.eq/not_equal.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res/mem.res.eq/not_equal.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.eq/not_equal.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res/mem.res.eq/not_equal.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.private/private_members.verify.cpp b/libcxx/test/std/mem/mem.res/mem.res/mem.res.private/private_members.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.private/private_members.verify.cpp
rename to libcxx/test/std/mem/mem.res/mem.res/mem.res.private/private_members.verify.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.private/protected_members.verify.cpp b/libcxx/test/std/mem/mem.res/mem.res/mem.res.private/protected_members.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.private/protected_members.verify.cpp
rename to libcxx/test/std/mem/mem.res/mem.res/mem.res.private/protected_members.verify.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.public/allocate.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res/mem.res.public/allocate.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.public/allocate.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res/mem.res.public/allocate.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.public/deallocate.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res/mem.res.public/deallocate.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.public/deallocate.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res/mem.res.public/deallocate.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.public/dtor.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res/mem.res.public/dtor.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.public/dtor.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res/mem.res.public/dtor.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.public/is_equal.pass.cpp b/libcxx/test/std/mem/mem.res/mem.res/mem.res.public/is_equal.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.public/is_equal.pass.cpp
rename to libcxx/test/std/mem/mem.res/mem.res/mem.res.public/is_equal.pass.cpp
diff --git a/libcxx/test/std/utilities/utility/mem.res/nodiscard.verify.cpp b/libcxx/test/std/mem/mem.res/nodiscard.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/utility/mem.res/nodiscard.verify.cpp
rename to libcxx/test/std/mem/mem.res/nodiscard.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.tag/allocator_arg.pass.cpp b/libcxx/test/std/mem/memory/allocator.tag/allocator_arg.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.tag/allocator_arg.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.tag/allocator_arg.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.tag/allocator_arg.verify.cpp b/libcxx/test/std/mem/memory/allocator.tag/allocator_arg.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.tag/allocator_arg.verify.cpp
rename to libcxx/test/std/mem/memory/allocator.tag/allocator_arg.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate.verify.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/allocate.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate.verify.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/allocate.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate_at_least.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/allocate_at_least.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate_at_least.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/allocate_at_least.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate_hint.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/allocate_hint.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate_hint.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/allocate_hint.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/construct.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/construct.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/construct.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/construct.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/destroy.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/destroy.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/destroy.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/destroy.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/incomplete_type_helper.h b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/incomplete_type_helper.h
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/incomplete_type_helper.h
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/incomplete_type_helper.h
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/select_on_container_copy_construction.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/select_on_container_copy_construction.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.members/select_on_container_copy_construction.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.members/select_on_container_copy_construction.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/const_pointer.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/const_pointer.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/const_pointer.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/const_pointer.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/const_void_pointer.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/const_void_pointer.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/const_void_pointer.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/const_void_pointer.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/difference_type.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/difference_type.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/difference_type.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/difference_type.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/is_always_equal.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/is_always_equal.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/is_always_equal.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/is_always_equal.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/pointer.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/pointer.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/pointer.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/pointer.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_copy_assignment.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/propagate_on_container_copy_assignment.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_copy_assignment.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/propagate_on_container_copy_assignment.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_move_assignment.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/propagate_on_container_move_assignment.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_move_assignment.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/propagate_on_container_move_assignment.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_swap.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/propagate_on_container_swap.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_swap.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/propagate_on_container_swap.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/rebind_alloc.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/rebind_alloc.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/rebind_alloc.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/rebind_alloc.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/size_type.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/size_type.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/size_type.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/size_type.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/void_pointer.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/void_pointer.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator.traits.types/void_pointer.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator.traits.types/void_pointer.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/allocator_type.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/allocator_type.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/allocator_type.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/allocator_type.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/rebind_traits.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/rebind_traits.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/rebind_traits.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/rebind_traits.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.traits/value_type.pass.cpp b/libcxx/test/std/mem/memory/allocator.traits/value_type.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.traits/value_type.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.traits/value_type.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/common.h b/libcxx/test/std/mem/memory/allocator.uses/allocator.uses.construction/common.h
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/common.h
rename to libcxx/test/std/mem/memory/allocator.uses/allocator.uses.construction/common.h
diff --git a/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/make_obj_using_allocator.pass.cpp b/libcxx/test/std/mem/memory/allocator.uses/allocator.uses.construction/make_obj_using_allocator.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/make_obj_using_allocator.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.uses/allocator.uses.construction/make_obj_using_allocator.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uninitialized_construct_using_allocator.pass.cpp b/libcxx/test/std/mem/memory/allocator.uses/allocator.uses.construction/uninitialized_construct_using_allocator.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uninitialized_construct_using_allocator.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.uses/allocator.uses.construction/uninitialized_construct_using_allocator.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp b/libcxx/test/std/mem/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.uses/allocator.uses.construction/uses_allocator_construction_args.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp b/libcxx/test/std/mem/memory/allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp
rename to libcxx/test/std/mem/memory/allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/c.malloc/nothing_to_do.pass.cpp b/libcxx/test/std/mem/memory/c.malloc/nothing_to_do.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/c.malloc/nothing_to_do.pass.cpp
rename to libcxx/test/std/mem/memory/c.malloc/nothing_to_do.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/default.allocator/PR50299.compile.pass.cpp b/libcxx/test/std/mem/memory/default.allocator/PR50299.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/default.allocator/PR50299.compile.pass.cpp
rename to libcxx/test/std/mem/memory/default.allocator/PR50299.compile.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator.ctor.pass.cpp b/libcxx/test/std/mem/memory/default.allocator/allocator.ctor.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/default.allocator/allocator.ctor.pass.cpp
rename to libcxx/test/std/mem/memory/default.allocator/allocator.ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator.dtor.pass.cpp b/libcxx/test/std/mem/memory/default.allocator/allocator.dtor.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/default.allocator/allocator.dtor.pass.cpp
rename to libcxx/test/std/mem/memory/default.allocator/allocator.dtor.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator.globals/eq.pass.cpp b/libcxx/test/std/mem/memory/default.allocator/allocator.globals/eq.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/default.allocator/allocator.globals/eq.pass.cpp
rename to libcxx/test/std/mem/memory/default.allocator/allocator.globals/eq.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.constexpr.size.verify.cpp b/libcxx/test/std/mem/memory/default.allocator/allocator.members/allocate.constexpr.size.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.constexpr.size.verify.cpp
rename to libcxx/test/std/mem/memory/default.allocator/allocator.members/allocate.constexpr.size.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp b/libcxx/test/std/mem/memory/default.allocator/allocator.members/allocate.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp
rename to libcxx/test/std/mem/memory/default.allocator/allocator.members/allocate.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.size.pass.cpp b/libcxx/test/std/mem/memory/default.allocator/allocator.members/allocate.size.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.size.pass.cpp
rename to libcxx/test/std/mem/memory/default.allocator/allocator.members/allocate.size.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.verify.cpp b/libcxx/test/std/mem/memory/default.allocator/allocator.members/allocate.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.verify.cpp
rename to libcxx/test/std/mem/memory/default.allocator/allocator.members/allocate.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate_at_least.pass.cpp b/libcxx/test/std/mem/memory/default.allocator/allocator.members/allocate_at_least.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate_at_least.pass.cpp
rename to libcxx/test/std/mem/memory/default.allocator/allocator.members/allocate_at_least.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp b/libcxx/test/std/mem/memory/default.allocator/allocator_pointers.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp
rename to libcxx/test/std/mem/memory/default.allocator/allocator_pointers.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator_types.deprecated_in_cxx17.verify.cpp b/libcxx/test/std/mem/memory/default.allocator/allocator_types.deprecated_in_cxx17.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/default.allocator/allocator_types.deprecated_in_cxx17.verify.cpp
rename to libcxx/test/std/mem/memory/default.allocator/allocator_types.deprecated_in_cxx17.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator_types.deprecated_in_cxx23.verify.cpp b/libcxx/test/std/mem/memory/default.allocator/allocator_types.deprecated_in_cxx23.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/default.allocator/allocator_types.deprecated_in_cxx23.verify.cpp
rename to libcxx/test/std/mem/memory/default.allocator/allocator_types.deprecated_in_cxx23.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator_types.pass.cpp b/libcxx/test/std/mem/memory/default.allocator/allocator_types.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/default.allocator/allocator_types.pass.cpp
rename to libcxx/test/std/mem/memory/default.allocator/allocator_types.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator_types.removed_in_cxx20.verify.cpp b/libcxx/test/std/mem/memory/default.allocator/allocator_types.removed_in_cxx20.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/default.allocator/allocator_types.removed_in_cxx20.verify.cpp
rename to libcxx/test/std/mem/memory/default.allocator/allocator_types.removed_in_cxx20.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator_types.removed_in_cxx26.verify.cpp b/libcxx/test/std/mem/memory/default.allocator/allocator_types.removed_in_cxx26.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/default.allocator/allocator_types.removed_in_cxx26.verify.cpp
rename to libcxx/test/std/mem/memory/default.allocator/allocator_types.removed_in_cxx26.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator_types.void.compile.pass.cpp b/libcxx/test/std/mem/memory/default.allocator/allocator_types.void.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/default.allocator/allocator_types.void.compile.pass.cpp
rename to libcxx/test/std/mem/memory/default.allocator/allocator_types.void.compile.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/pointer.conversion/to_address.pass.cpp b/libcxx/test/std/mem/memory/pointer.conversion/to_address.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/pointer.conversion/to_address.pass.cpp
rename to libcxx/test/std/mem/memory/pointer.conversion/to_address.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/pointer.conversion/to_address_on_funcptr.verify.cpp b/libcxx/test/std/mem/memory/pointer.conversion/to_address_on_funcptr.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/pointer.conversion/to_address_on_funcptr.verify.cpp
rename to libcxx/test/std/mem/memory/pointer.conversion/to_address_on_funcptr.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/pointer.conversion/to_address_on_function.verify.cpp b/libcxx/test/std/mem/memory/pointer.conversion/to_address_on_function.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/pointer.conversion/to_address_on_function.verify.cpp
rename to libcxx/test/std/mem/memory/pointer.conversion/to_address_on_function.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/pointer.conversion/to_address_std_iterators.pass.cpp b/libcxx/test/std/mem/memory/pointer.conversion/to_address_std_iterators.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/pointer.conversion/to_address_std_iterators.pass.cpp
rename to libcxx/test/std/mem/memory/pointer.conversion/to_address_std_iterators.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/pointer.conversion/to_address_without_pointer_traits.pass.cpp b/libcxx/test/std/mem/memory/pointer.conversion/to_address_without_pointer_traits.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/pointer.conversion/to_address_without_pointer_traits.pass.cpp
rename to libcxx/test/std/mem/memory/pointer.conversion/to_address_without_pointer_traits.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.functions/pointer_to.pass.cpp b/libcxx/test/std/mem/memory/pointer.traits/pointer.traits.functions/pointer_to.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.functions/pointer_to.pass.cpp
rename to libcxx/test/std/mem/memory/pointer.traits/pointer.traits.functions/pointer_to.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.types/difference_type.compile.pass.cpp b/libcxx/test/std/mem/memory/pointer.traits/pointer.traits.types/difference_type.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.types/difference_type.compile.pass.cpp
rename to libcxx/test/std/mem/memory/pointer.traits/pointer.traits.types/difference_type.compile.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.types/element_type.compile.pass.cpp b/libcxx/test/std/mem/memory/pointer.traits/pointer.traits.types/element_type.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.types/element_type.compile.pass.cpp
rename to libcxx/test/std/mem/memory/pointer.traits/pointer.traits.types/element_type.compile.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.types/lwg3545.compile.pass.cpp b/libcxx/test/std/mem/memory/pointer.traits/pointer.traits.types/lwg3545.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.types/lwg3545.compile.pass.cpp
rename to libcxx/test/std/mem/memory/pointer.traits/pointer.traits.types/lwg3545.compile.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.types/pointer.compile.pass.cpp b/libcxx/test/std/mem/memory/pointer.traits/pointer.traits.types/pointer.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.types/pointer.compile.pass.cpp
rename to libcxx/test/std/mem/memory/pointer.traits/pointer.traits.types/pointer.compile.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.types/rebind.compile.pass.cpp b/libcxx/test/std/mem/memory/pointer.traits/pointer.traits.types/rebind.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/pointer.traits/pointer.traits.types/rebind.compile.pass.cpp
rename to libcxx/test/std/mem/memory/pointer.traits/pointer.traits.types/rebind.compile.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/pointer.traits/ptr.pointer_to.pass.cpp b/libcxx/test/std/mem/memory/pointer.traits/ptr.pointer_to.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/pointer.traits/ptr.pointer_to.pass.cpp
rename to libcxx/test/std/mem/memory/pointer.traits/ptr.pointer_to.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/pointer.traits/ptr.types.compile.pass.cpp b/libcxx/test/std/mem/memory/pointer.traits/ptr.types.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/pointer.traits/ptr.types.compile.pass.cpp
rename to libcxx/test/std/mem/memory/pointer.traits/ptr.types.compile.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/ptr.align/align.pass.cpp b/libcxx/test/std/mem/memory/ptr.align/align.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/ptr.align/align.pass.cpp
rename to libcxx/test/std/mem/memory/ptr.align/align.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/ptr.align/assume_aligned.nodiscard.verify.cpp b/libcxx/test/std/mem/memory/ptr.align/assume_aligned.nodiscard.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/ptr.align/assume_aligned.nodiscard.verify.cpp
rename to libcxx/test/std/mem/memory/ptr.align/assume_aligned.nodiscard.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/ptr.align/assume_aligned.pass.cpp b/libcxx/test/std/mem/memory/ptr.align/assume_aligned.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/ptr.align/assume_aligned.pass.cpp
rename to libcxx/test/std/mem/memory/ptr.align/assume_aligned.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/buffer.h b/libcxx/test/std/mem/memory/specialized.algorithms/buffer.h
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/buffer.h
rename to libcxx/test/std/mem/memory/specialized.algorithms/buffer.h
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/counted.h b/libcxx/test/std/mem/memory/specialized.algorithms/counted.h
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/counted.h
rename to libcxx/test/std/mem/memory/specialized.algorithms/counted.h
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/overload_compare_iterator.h b/libcxx/test/std/mem/memory/specialized.algorithms/overload_compare_iterator.h
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/overload_compare_iterator.h
rename to libcxx/test/std/mem/memory/specialized.algorithms/overload_compare_iterator.h
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/ranges_robust_against_nonbool.compile.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/ranges_robust_against_nonbool.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/ranges_robust_against_nonbool.compile.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/ranges_robust_against_nonbool.compile.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/addressof.temp.compile.fail.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/specialized.addressof/addressof.temp.compile.fail.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/addressof.temp.compile.fail.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/specialized.addressof/addressof.temp.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/constexpr_addressof.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/specialized.addressof/constexpr_addressof.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/constexpr_addressof.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/specialized.addressof/constexpr_addressof.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.construct/construct_at.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/specialized.construct/construct_at.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/specialized.construct/construct_at.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/specialized.construct/construct_at.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.construct/ranges_construct_at.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/specialized.construct/ranges_construct_at.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/specialized.construct/ranges_construct_at.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/specialized.construct/ranges_construct_at.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/destroy.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/specialized.destroy/destroy.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/destroy.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/specialized.destroy/destroy.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/destroy_at.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/specialized.destroy/destroy_at.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/destroy_at.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/specialized.destroy/destroy_at.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/destroy_n.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/specialized.destroy/destroy_n.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/destroy_n.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/specialized.destroy/destroy_n.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/ranges_destroy.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/specialized.destroy/ranges_destroy.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/ranges_destroy.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/specialized.destroy/ranges_destroy.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/ranges_destroy_at.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/specialized.destroy/ranges_destroy_at.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/ranges_destroy_at.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/specialized.destroy/ranges_destroy_at.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/ranges_destroy_n.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/specialized.destroy/ranges_destroy_n.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/ranges_destroy_n.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/specialized.destroy/ranges_destroy_n.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/ranges_uninitialized_default_construct.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.construct.default/ranges_uninitialized_default_construct.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/ranges_uninitialized_default_construct.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.construct.default/ranges_uninitialized_default_construct.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/ranges_uninitialized_default_construct_n.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.construct.default/ranges_uninitialized_default_construct_n.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/ranges_uninitialized_default_construct_n.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.construct.default/ranges_uninitialized_default_construct_n.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/ranges_uninitialized_value_construct.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.construct.value/ranges_uninitialized_value_construct.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/ranges_uninitialized_value_construct.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.construct.value/ranges_uninitialized_value_construct.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/ranges_uninitialized_value_construct_n.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.construct.value/ranges_uninitialized_value_construct_n.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/ranges_uninitialized_value_construct_n.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.construct.value/ranges_uninitialized_value_construct_n.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct_n.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct_n.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct_n.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct_n.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.copy/ranges_uninitialized_copy.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.copy/ranges_uninitialized_copy.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.copy/ranges_uninitialized_copy.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.copy/ranges_uninitialized_copy.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.copy/ranges_uninitialized_copy_n.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.copy/ranges_uninitialized_copy_n.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.copy/ranges_uninitialized_copy_n.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.copy/ranges_uninitialized_copy_n.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy_n.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy_n.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy_n.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy_n.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.fill.n/ranges_uninitialized_fill_n.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.fill.n/ranges_uninitialized_fill_n.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.fill.n/ranges_uninitialized_fill_n.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.fill.n/ranges_uninitialized_fill_n.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.fill.n/uninitialized_fill_n.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.fill.n/uninitialized_fill_n.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.fill.n/uninitialized_fill_n.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.fill.n/uninitialized_fill_n.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.fill/ranges_uninitialized_fill.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.fill/ranges_uninitialized_fill.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.fill/ranges_uninitialized_fill.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.fill/ranges_uninitialized_fill.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.fill/uninitialized_fill.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.fill/uninitialized_fill.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.fill/uninitialized_fill.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.fill/uninitialized_fill.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/ranges_uninitialized_move.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.move/ranges_uninitialized_move.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/ranges_uninitialized_move.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.move/ranges_uninitialized_move.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/ranges_uninitialized_move_n.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.move/ranges_uninitialized_move_n.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/ranges_uninitialized_move_n.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.move/ranges_uninitialized_move_n.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp b/libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp
rename to libcxx/test/std/mem/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/storage.iterator/deprecated.verify.cpp b/libcxx/test/std/mem/memory/storage.iterator/deprecated.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/storage.iterator/deprecated.verify.cpp
rename to libcxx/test/std/mem/memory/storage.iterator/deprecated.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/storage.iterator/raw_storage_iterator.base.pass.cpp b/libcxx/test/std/mem/memory/storage.iterator/raw_storage_iterator.base.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/storage.iterator/raw_storage_iterator.base.pass.cpp
rename to libcxx/test/std/mem/memory/storage.iterator/raw_storage_iterator.base.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/storage.iterator/raw_storage_iterator.pass.cpp b/libcxx/test/std/mem/memory/storage.iterator/raw_storage_iterator.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/storage.iterator/raw_storage_iterator.pass.cpp
rename to libcxx/test/std/mem/memory/storage.iterator/raw_storage_iterator.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/storage.iterator/types.compile.pass.cpp b/libcxx/test/std/mem/memory/storage.iterator/types.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/storage.iterator/types.compile.pass.cpp
rename to libcxx/test/std/mem/memory/storage.iterator/types.compile.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/temporary.buffer/depr.verify.cpp b/libcxx/test/std/mem/memory/temporary.buffer/depr.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/temporary.buffer/depr.verify.cpp
rename to libcxx/test/std/mem/memory/temporary.buffer/depr.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/temporary.buffer/overaligned.pass.cpp b/libcxx/test/std/mem/memory/temporary.buffer/overaligned.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/temporary.buffer/overaligned.pass.cpp
rename to libcxx/test/std/mem/memory/temporary.buffer/overaligned.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/temporary.buffer/temporary_buffer.pass.cpp b/libcxx/test/std/mem/memory/temporary.buffer/temporary_buffer.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/temporary.buffer/temporary_buffer.pass.cpp
rename to libcxx/test/std/mem/memory/temporary.buffer/temporary_buffer.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/unique.ptr/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/mem/memory/unique.ptr/iterator_concept_conformance.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/unique.ptr/iterator_concept_conformance.compile.pass.cpp
rename to libcxx/test/std/mem/memory/unique.ptr/iterator_concept_conformance.compile.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.special/io.pass.cpp b/libcxx/test/std/mem/memory/unique.ptr/unique.ptr.special/io.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.special/io.pass.cpp
rename to libcxx/test/std/mem/memory/unique.ptr/unique.ptr.special/io.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.special/io.verify.cpp b/libcxx/test/std/mem/memory/unique.ptr/unique.ptr.special/io.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.special/io.verify.cpp
rename to libcxx/test/std/mem/memory/unique.ptr/unique.ptr.special/io.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/iterator_concept_conformance.compile.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/iterator_concept_conformance.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/iterator_concept_conformance.compile.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/iterator_concept_conformance.compile.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/types.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/types.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/types.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/types.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/auto_ptr_Y.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/auto_ptr_Y.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/auto_ptr_Y.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/auto_ptr_Y.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y_rv.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y_rv.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y_rv.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y_rv.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_rv.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_rv.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_rv.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_rv.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/unique_ptr_Y.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/unique_ptr_Y.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/unique_ptr_Y.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/unique_ptr_Y.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/const_pointer_cast.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/const_pointer_cast.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/const_pointer_cast.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/const_pointer_cast.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/reinterpret_pointer_cast.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/reinterpret_pointer_cast.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/reinterpret_pointer_cast.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/reinterpret_pointer_cast.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/static_pointer_cast.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/static_pointer_cast.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/static_pointer_cast.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/static_pointer_cast.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp_nullptr.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp_nullptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp_nullptr.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp_nullptr.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/deduction.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/deduction.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/deduction.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/deduction.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/default.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/default.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/default.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/default.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y_rv.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y_rv.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y_rv.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y_rv.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_copy_move.verify.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_copy_move.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_copy_move.verify.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_copy_move.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_pointer.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_pointer.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_pointer.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_pointer.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_rv.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_rv.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_rv.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_rv.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/types.h b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/types.h
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/types.h
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/types.h
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/weak_ptr.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/weak_ptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/weak_ptr.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/weak_ptr.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.array.bounded.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.array.bounded.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.array.bounded.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.array.bounded.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.array.unbounded.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.array.unbounded.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.array.unbounded.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.array.unbounded.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.explicit_conversion.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.explicit_conversion.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.explicit_conversion.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.explicit_conversion.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.lwg2070.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.lwg2070.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.lwg2070.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.lwg2070.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_for_overwrite.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_for_overwrite.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_for_overwrite.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared_for_overwrite.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.array.bounded.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.array.bounded.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.array.bounded.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.array.bounded.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.array.unbounded.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.array.unbounded.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.array.unbounded.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.array.unbounded.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.private.compile.fail.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.private.compile.fail.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.private.compile.fail.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.private.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared_for_overwrite.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared_for_overwrite.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared_for_overwrite.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared_for_overwrite.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/types.h b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/types.h
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/types.h
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/types.h
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.dest/tested_elsewhere.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.dest/tested_elsewhere.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.dest/tested_elsewhere.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.dest/tested_elsewhere.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/io.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/io.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/io.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/io.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_helper.h b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_helper.h
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_helper.h
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_helper.h
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/swap.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/swap.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/swap.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/swap.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/arrow.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/arrow.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/arrow.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/arrow.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/dereference.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/dereference.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/dereference.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/dereference.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_arrow.verify.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_arrow.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_arrow.verify.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_arrow.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bool.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bool.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bool.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bool.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bracket.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bracket.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bracket.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bracket.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bracket.verify.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bracket.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bracket.verify.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bracket.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_shared_ptr.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_shared_ptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_shared_ptr.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_shared_ptr.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_weak_ptr.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_weak_ptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_weak_ptr.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_weak_ptr.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.deprecated_in_cxx17.verify.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.deprecated_in_cxx17.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.deprecated_in_cxx17.verify.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.deprecated_in_cxx17.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.removed_in_cxx20.verify.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.removed_in_cxx20.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.removed_in_cxx20.verify.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.removed_in_cxx20.verify.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/swap.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/swap.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/swap.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/swap.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/types.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/types.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/types.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/types.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/owner_less.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/owner_less.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/owner_less.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/owner_less.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/shared_ptr_Y.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/shared_ptr_Y.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/shared_ptr_Y.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/shared_ptr_Y.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr_Y.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr_Y.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr_Y.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr_Y.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/default.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/default.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/default.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/default.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/pr40459.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/pr40459.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/pr40459.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/pr40459.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_Y.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_Y.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_Y.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_Y.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_deduction.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_deduction.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_deduction.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_deduction.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr_Y.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr_Y.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr_Y.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr_Y.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.dest/tested_elsewhere.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.dest/tested_elsewhere.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.dest/tested_elsewhere.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.dest/tested_elsewhere.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/reset.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/reset.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/reset.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/reset.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/swap.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/swap.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/swap.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/swap.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/expired.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/expired.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/expired.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/expired.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/lock.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/lock.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/lock.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/lock.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/not_less_than.compile.fail.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/not_less_than.compile.fail.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/not_less_than.compile.fail.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/not_less_than.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_shared_ptr.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_shared_ptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_shared_ptr.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_shared_ptr.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_weak_ptr.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_weak_ptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_weak_ptr.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_weak_ptr.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/swap.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/swap.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/swap.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/swap.pass.cpp
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weakptr/bad_weak_ptr.pass.cpp b/libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weakptr/bad_weak_ptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weakptr/bad_weak_ptr.pass.cpp
rename to libcxx/test/std/mem/memory/util.smartptr/util.smartptr.weakptr/bad_weak_ptr.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/README.TXT b/libcxx/test/std/mem/smartptr/unique.ptr/README.TXT
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/README.TXT
rename to libcxx/test/std/mem/smartptr/unique.ptr/README.TXT
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/pointer_type.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/pointer_type.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/pointer_type.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/pointer_type.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.runtime.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.runtime.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.runtime.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.runtime.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.single.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.single.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.single.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/move_convert.single.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/null.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/null.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/null.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/null.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/nullptr.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/nullptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/nullptr.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.asgn/nullptr.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/auto_pointer.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/auto_pointer.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/auto_pointer.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/auto_pointer.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/deduct.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/deduct.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/deduct.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/deduct.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.runtime.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.runtime.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.runtime.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.runtime.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.single.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.single.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.single.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/move_convert.single.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer_deleter.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer_deleter.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer_deleter.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer_deleter.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer_deleter.verify.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer_deleter.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer_deleter.verify.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer_deleter.verify.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.dtor/null.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.dtor/null.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.dtor/null.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.dtor/null.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/release.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/release.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/release.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/release.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.runtime.verify.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.runtime.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.runtime.verify.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.runtime.verify.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.single.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.single.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.single.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.single.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset_self.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset_self.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset_self.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset_self.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/swap.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/swap.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/swap.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/swap.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/dereference.single.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/dereference.single.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/dereference.single.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/dereference.single.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/dereference.verify.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/dereference.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/dereference.verify.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/dereference.verify.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/explicit_bool.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/explicit_bool.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/explicit_bool.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/explicit_bool.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/get.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/get.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/get.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/get.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/get_deleter.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/get_deleter.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/get_deleter.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/get_deleter.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_arrow.single.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_arrow.single.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_arrow.single.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_arrow.single.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_arrow.verify.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_arrow.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_arrow.verify.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_arrow.verify.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.runtime.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.runtime.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.runtime.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.runtime.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.single.verify.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.single.verify.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.single.verify.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.single.verify.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique.array.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique.array.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array1.compile.fail.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique.array1.compile.fail.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array1.compile.fail.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique.array1.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array2.compile.fail.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique.array2.compile.fail.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array2.compile.fail.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique.array2.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array3.compile.fail.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique.array3.compile.fail.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array3.compile.fail.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique.array3.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array4.compile.fail.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique.array4.compile.fail.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array4.compile.fail.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique.array4.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.single.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique.single.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.single.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique.single.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.sizezero.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique.sizezero.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.sizezero.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique.sizezero.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique_for_overwrite.default_init.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique_for_overwrite.default_init.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique_for_overwrite.default_init.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique_for_overwrite.default_init.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique_for_overwrite.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique_for_overwrite.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique_for_overwrite.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.create/make_unique_for_overwrite.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/convert_ctor.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/convert_ctor.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/convert_ctor.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/convert_ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/default.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/default.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/default.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/default.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/incomplete.compile.fail.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/incomplete.compile.fail.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/incomplete.compile.fail.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/incomplete.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/void.compile.fail.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/void.compile.fail.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/void.compile.fail.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/void.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.compile.fail.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.compile.fail.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.compile.fail.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/default.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/default.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/default.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/default.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/incomplete.compile.fail.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/incomplete.compile.fail.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/incomplete.compile.fail.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/incomplete.compile.fail.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.general/nothing_to_do.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.general/nothing_to_do.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.general/nothing_to_do.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.general/nothing_to_do.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/cmp.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.special/cmp.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/cmp.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.special/cmp.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/cmp_nullptr.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.special/cmp_nullptr.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/cmp_nullptr.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.special/cmp_nullptr.pass.cpp
diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/swap.pass.cpp b/libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.special/swap.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.special/swap.pass.cpp
rename to libcxx/test/std/mem/smartptr/unique.ptr/unique.ptr.special/swap.pass.cpp