diff --git a/test/std/algorithms/version.pass.cpp b/test/libcxx/algorithms/version.pass.cpp
similarity index 100%
rename from test/std/algorithms/version.pass.cpp
rename to test/libcxx/algorithms/version.pass.cpp
diff --git a/test/std/containers/associative/map/version.pass.cpp b/test/libcxx/containers/associative/map/version.pass.cpp
similarity index 100%
rename from test/std/containers/associative/map/version.pass.cpp
rename to test/libcxx/containers/associative/map/version.pass.cpp
diff --git a/test/std/containers/associative/set/version.pass.cpp b/test/libcxx/containers/associative/set/version.pass.cpp
similarity index 100%
rename from test/std/containers/associative/set/version.pass.cpp
rename to test/libcxx/containers/associative/set/version.pass.cpp
diff --git a/test/std/containers/container.adaptors/queue/version.pass.cpp b/test/libcxx/containers/container.adaptors/queue/version.pass.cpp
similarity index 100%
rename from test/std/containers/container.adaptors/queue/version.pass.cpp
rename to test/libcxx/containers/container.adaptors/queue/version.pass.cpp
diff --git a/test/std/containers/container.adaptors/stack/version.pass.cpp b/test/libcxx/containers/container.adaptors/stack/version.pass.cpp
similarity index 100%
rename from test/std/containers/container.adaptors/stack/version.pass.cpp
rename to test/libcxx/containers/container.adaptors/stack/version.pass.cpp
diff --git a/test/std/containers/sequences/array/version.pass.cpp b/test/libcxx/containers/sequences/array/version.pass.cpp
similarity index 100%
rename from test/std/containers/sequences/array/version.pass.cpp
rename to test/libcxx/containers/sequences/array/version.pass.cpp
diff --git a/test/std/containers/sequences/deque/version.pass.cpp b/test/libcxx/containers/sequences/deque/version.pass.cpp
similarity index 100%
rename from test/std/containers/sequences/deque/version.pass.cpp
rename to test/libcxx/containers/sequences/deque/version.pass.cpp
diff --git a/test/std/containers/sequences/forwardlist/version.pass.cpp b/test/libcxx/containers/sequences/forwardlist/version.pass.cpp
similarity index 100%
rename from test/std/containers/sequences/forwardlist/version.pass.cpp
rename to test/libcxx/containers/sequences/forwardlist/version.pass.cpp
diff --git a/test/std/containers/sequences/list/version.pass.cpp b/test/libcxx/containers/sequences/list/version.pass.cpp
similarity index 100%
rename from test/std/containers/sequences/list/version.pass.cpp
rename to test/libcxx/containers/sequences/list/version.pass.cpp
diff --git a/test/std/containers/sequences/vector/version.pass.cpp b/test/libcxx/containers/sequences/vector/version.pass.cpp
similarity index 100%
rename from test/std/containers/sequences/vector/version.pass.cpp
rename to test/libcxx/containers/sequences/vector/version.pass.cpp
diff --git a/test/std/containers/unord/unord.map/version.pass.cpp b/test/libcxx/containers/unord/unord.map/version.pass.cpp
similarity index 100%
rename from test/std/containers/unord/unord.map/version.pass.cpp
rename to test/libcxx/containers/unord/unord.map/version.pass.cpp
diff --git a/test/std/containers/unord/unord.set/version.pass.cpp b/test/libcxx/containers/unord/unord.set/version.pass.cpp
similarity index 100%
rename from test/std/containers/unord/unord.set/version.pass.cpp
rename to test/libcxx/containers/unord/unord.set/version.pass.cpp
diff --git a/test/std/depr/depr.str.strstreams/version.pass.cpp b/test/libcxx/depr/depr.str.strstreams/version.pass.cpp
similarity index 100%
rename from test/std/depr/depr.str.strstreams/version.pass.cpp
rename to test/libcxx/depr/depr.str.strstreams/version.pass.cpp
diff --git a/test/std/input.output/file.streams/c.files/version_ccstdio.pass.cpp b/test/libcxx/input.output/file.streams/c.files/version_ccstdio.pass.cpp
similarity index 100%
rename from test/std/input.output/file.streams/c.files/version_ccstdio.pass.cpp
rename to test/libcxx/input.output/file.streams/c.files/version_ccstdio.pass.cpp
diff --git a/test/std/input.output/file.streams/c.files/version_cinttypes.pass.cpp b/test/libcxx/input.output/file.streams/c.files/version_cinttypes.pass.cpp
similarity index 100%
rename from test/std/input.output/file.streams/c.files/version_cinttypes.pass.cpp
rename to test/libcxx/input.output/file.streams/c.files/version_cinttypes.pass.cpp
diff --git a/test/std/input.output/file.streams/fstreams/version.pass.cpp b/test/libcxx/input.output/file.streams/fstreams/version.pass.cpp
similarity index 100%
rename from test/std/input.output/file.streams/fstreams/version.pass.cpp
rename to test/libcxx/input.output/file.streams/fstreams/version.pass.cpp
diff --git a/test/std/input.output/iostream.format/input.streams/version.pass.cpp b/test/libcxx/input.output/iostream.format/input.streams/version.pass.cpp
similarity index 100%
rename from test/std/input.output/iostream.format/input.streams/version.pass.cpp
rename to test/libcxx/input.output/iostream.format/input.streams/version.pass.cpp
diff --git a/test/std/input.output/iostream.format/output.streams/version.pass.cpp b/test/libcxx/input.output/iostream.format/output.streams/version.pass.cpp
similarity index 100%
rename from test/std/input.output/iostream.format/output.streams/version.pass.cpp
rename to test/libcxx/input.output/iostream.format/output.streams/version.pass.cpp
diff --git a/test/std/input.output/iostream.format/std.manip/version.pass.cpp b/test/libcxx/input.output/iostream.format/std.manip/version.pass.cpp
similarity index 100%
rename from test/std/input.output/iostream.format/std.manip/version.pass.cpp
rename to test/libcxx/input.output/iostream.format/std.manip/version.pass.cpp
diff --git a/test/std/input.output/iostream.forward/version.pass.cpp b/test/libcxx/input.output/iostream.forward/version.pass.cpp
similarity index 100%
rename from test/std/input.output/iostream.forward/version.pass.cpp
rename to test/libcxx/input.output/iostream.forward/version.pass.cpp
diff --git a/test/std/input.output/iostream.objects/version.pass.cpp b/test/libcxx/input.output/iostream.objects/version.pass.cpp
similarity index 100%
rename from test/std/input.output/iostream.objects/version.pass.cpp
rename to test/libcxx/input.output/iostream.objects/version.pass.cpp
diff --git a/test/std/input.output/iostreams.base/version.pass.cpp b/test/libcxx/input.output/iostreams.base/version.pass.cpp
similarity index 100%
rename from test/std/input.output/iostreams.base/version.pass.cpp
rename to test/libcxx/input.output/iostreams.base/version.pass.cpp
diff --git a/test/std/input.output/stream.buffers/version.pass.cpp b/test/libcxx/input.output/stream.buffers/version.pass.cpp
similarity index 100%
rename from test/std/input.output/stream.buffers/version.pass.cpp
rename to test/libcxx/input.output/stream.buffers/version.pass.cpp
diff --git a/test/std/input.output/string.streams/version.pass.cpp b/test/libcxx/input.output/string.streams/version.pass.cpp
similarity index 100%
rename from test/std/input.output/string.streams/version.pass.cpp
rename to test/libcxx/input.output/string.streams/version.pass.cpp
diff --git a/test/std/iterators/version.pass.cpp b/test/libcxx/iterators/version.pass.cpp
similarity index 100%
rename from test/std/iterators/version.pass.cpp
rename to test/libcxx/iterators/version.pass.cpp
diff --git a/test/std/localization/c.locales/version.pass.cpp b/test/libcxx/localization/c.locales/version.pass.cpp
similarity index 100%
rename from test/std/localization/c.locales/version.pass.cpp
rename to test/libcxx/localization/c.locales/version.pass.cpp
diff --git a/test/std/localization/locale.stdcvt/version.pass.cpp b/test/libcxx/localization/locale.stdcvt/version.pass.cpp
similarity index 100%
rename from test/std/localization/locale.stdcvt/version.pass.cpp
rename to test/libcxx/localization/locale.stdcvt/version.pass.cpp
diff --git a/test/std/localization/version.pass.cpp b/test/libcxx/localization/version.pass.cpp
similarity index 100%
rename from test/std/localization/version.pass.cpp
rename to test/libcxx/localization/version.pass.cpp
diff --git a/test/std/numerics/cfenv/version.pass.cpp b/test/libcxx/numerics/cfenv/version.pass.cpp
similarity index 100%
rename from test/std/numerics/cfenv/version.pass.cpp
rename to test/libcxx/numerics/cfenv/version.pass.cpp
diff --git a/test/std/numerics/complex.number/version.pass.cpp b/test/libcxx/numerics/complex.number/version.pass.cpp
similarity index 100%
rename from test/std/numerics/complex.number/version.pass.cpp
rename to test/libcxx/numerics/complex.number/version.pass.cpp
diff --git a/test/std/numerics/numarray/version.pass.cpp b/test/libcxx/numerics/numarray/version.pass.cpp
similarity index 100%
rename from test/std/numerics/numarray/version.pass.cpp
rename to test/libcxx/numerics/numarray/version.pass.cpp
diff --git a/test/std/numerics/numeric.ops/version.pass.cpp b/test/libcxx/numerics/numeric.ops/version.pass.cpp
similarity index 100%
rename from test/std/numerics/numeric.ops/version.pass.cpp
rename to test/libcxx/numerics/numeric.ops/version.pass.cpp
diff --git a/test/std/numerics/rand/rand.synopsis/version.pass.cpp b/test/libcxx/numerics/rand/rand.synopsis/version.pass.cpp
similarity index 100%
rename from test/std/numerics/rand/rand.synopsis/version.pass.cpp
rename to test/libcxx/numerics/rand/rand.synopsis/version.pass.cpp
diff --git a/test/std/utilities/function.objects/version.pass.cpp b/test/libcxx/utilities/function.objects/version.pass.cpp
similarity index 100%
rename from test/std/utilities/function.objects/version.pass.cpp
rename to test/libcxx/utilities/function.objects/version.pass.cpp
diff --git a/test/std/utilities/memory/version.pass.cpp b/test/libcxx/utilities/memory/version.pass.cpp
similarity index 100%
rename from test/std/utilities/memory/version.pass.cpp
rename to test/libcxx/utilities/memory/version.pass.cpp
diff --git a/test/std/utilities/meta/version.pass.cpp b/test/libcxx/utilities/meta/version.pass.cpp
similarity index 100%
rename from test/std/utilities/meta/version.pass.cpp
rename to test/libcxx/utilities/meta/version.pass.cpp
diff --git a/test/std/utilities/ratio/version.pass.cpp b/test/libcxx/utilities/ratio/version.pass.cpp
similarity index 100%
rename from test/std/utilities/ratio/version.pass.cpp
rename to test/libcxx/utilities/ratio/version.pass.cpp
diff --git a/test/std/utilities/template.bitset/version.pass.cpp b/test/libcxx/utilities/template.bitset/version.pass.cpp
similarity index 100%
rename from test/std/utilities/template.bitset/version.pass.cpp
rename to test/libcxx/utilities/template.bitset/version.pass.cpp
diff --git a/test/std/utilities/time/version.pass.cpp b/test/libcxx/utilities/time/version.pass.cpp
similarity index 100%
rename from test/std/utilities/time/version.pass.cpp
rename to test/libcxx/utilities/time/version.pass.cpp
diff --git a/test/std/utilities/tuple/version.pass.cpp b/test/libcxx/utilities/tuple/version.pass.cpp
similarity index 100%
rename from test/std/utilities/tuple/version.pass.cpp
rename to test/libcxx/utilities/tuple/version.pass.cpp
diff --git a/test/std/utilities/type.index/version.pass.cpp b/test/libcxx/utilities/type.index/version.pass.cpp
similarity index 100%
rename from test/std/utilities/type.index/version.pass.cpp
rename to test/libcxx/utilities/type.index/version.pass.cpp
diff --git a/test/std/utilities/utility/version.pass.cpp b/test/libcxx/utilities/utility/version.pass.cpp
similarity index 100%
rename from test/std/utilities/utility/version.pass.cpp
rename to test/libcxx/utilities/utility/version.pass.cpp