Update libc++ sources to @180916

This patches updates the llvm libc++ in the following way:

1/ Move all llvm-specific sources from .../llvm-libc++/ to
  .../llvm-libc++/libcxx/

2/ Move .../android/README to .../README.NDK and update it
   with upstream/patch information.

3/ Add .../patches.android containing the list of Android-specific
   patches used to generate the content of libcxx/ after checking
   out the upstream version of the sources.

4/ Move .../android/llvm/libc++/Android.mk to .../Android.mk

5/ Move .../include/support/android/ to .../android/support/include/
   and .../src/support/android/ to .../android/support/src/

   It's likely that this will go into another helper static
   library at some point, since it provides missing C library
   functions that could benefit other programs.

   This move makes updating the support code easier since it
   doesn't require changing the content of patches.android/
   each time.

Apart from that, there is no drastic change here in features / bugs,
the test program still links but the library probably doesn't do
much and will crash easily.

Change-Id: I953cc528ba3d0199b5947ef3dbdcbfedfb25f3e8
diff --git a/sources/cxx-stl/llvm-libc++/.arcconfig b/sources/cxx-stl/llvm-libc++/.arcconfig
deleted file mode 100644
index 283bc23..0000000
--- a/sources/cxx-stl/llvm-libc++/.arcconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "project_id" : "libcxx",
-  "conduit_uri" : "http://llvm-reviews.chandlerc.com/"
-}
diff --git a/sources/cxx-stl/llvm-libc++/Android.mk b/sources/cxx-stl/llvm-libc++/Android.mk
new file mode 100644
index 0000000..09aa5a4
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/Android.mk
@@ -0,0 +1,103 @@
+# This file is dual licensed under the MIT and the University of Illinois Open
+# Source Licenses. See LICENSE.TXT for details.
+
+LOCAL_PATH := $(call my-dir)
+
+llvm_libc++_includes := $(LOCAL_PATH)/libcxx/include
+llvm_libc++_export_includes := $(llvm_libc++_includes)
+llvm_libc++_sources := \
+	algorithm.cpp \
+	bind.cpp \
+	chrono.cpp \
+	condition_variable.cpp \
+	debug.cpp \
+	exception.cpp \
+	future.cpp \
+	hash.cpp \
+	ios.cpp \
+	iostream.cpp \
+	locale.cpp \
+	memory.cpp \
+	mutex.cpp \
+	new.cpp \
+	random.cpp \
+	regex.cpp \
+	stdexcept.cpp \
+	string.cpp \
+	strstream.cpp \
+	system_error.cpp \
+	thread.cpp \
+	typeinfo.cpp \
+	utility.cpp \
+	valarray.cpp
+
+llvm_libc++_sources := $(llvm_libc++_sources:%=libcxx/src/%)
+
+# For now, this library can only be used to build C++11 binaries.
+llvm_libc++_export_cxxflags := -std=c++11
+
+llvm_libc++_cxxflags := $(llvm_libc++_export_cxxflags)
+
+# Building this library with -fno-rtti is not supported, though using it
+# without RTTI is ok.
+#
+llvm_libc++_cxxflags += -fno-rtti
+
+# LIBCXXRT tells the library to support building against the libcxxrt
+# C++ runtime, instead of GNU libsupc++.
+#
+llvm_libc++_cxxflags += -DLIBCXXRT=1
+
+# Since libcxxrt seems to hard to port to Android, use GAbi++ instead.
+# The GAbi++ sources are compiled with the GABIXX_LIBCXX macro defined
+# to tell them they'll be part of libc++.
+#
+# This is also used in a couple of places inside of libc++ to deal with
+# a few cases where GAbi++ doesn't support the libcxxrt ABI perfectly
+# yet.
+#
+llvm_libc++_cxxflags += -DGABIXX_LIBCXX
+
+# Find the GAbi++ sources to include them here.
+# The voodoo below is to allow building libc++ out of the NDK source
+# tree. This can make it easier to experiment / update / debug it.
+#
+libgabi++_sources_dir := $(strip $(wildcard $(LOCAL_PATH)/../gabi++))
+ifdef libgabi++_sources_dir
+  libgabi++_sources_prefix := ../gabi++
+else
+  libgabi++_sources_dir := $(strip $(wildcard $(NDK_ROOT)/sources/cxx-stl/gabi++))
+  ifndef libgabi++_sources_dir
+    $(error Can't find GAbi++ sources directory!!)
+  endif
+  libgabi++_sources_prefix := $(libgabi++_sources_dir)
+endif
+
+include $(libgabi++_sources_dir)/sources.mk
+llvm_libc++_sources += $(addprefix $(libgabi++_sources_prefix:%/=%)/,$(libgabi++_src_files))
+llvm_libc++_includes += $(libgabi++_c_includes)
+llvm_libc++_export_includes += $(libgabi++_c_includes)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := llvm_libc++_static
+LOCAL_SRC_FILES := $(llvm_libc++_sources)
+LOCAL_C_INCLUDES := $(llvm_libc++_includes)
+LOCAL_CPPFLAGS := $(llvm_libc++_cxxflags)
+LOCAL_CPP_FEATURES := rtti exceptions
+LOCAL_EXPORT_C_INCLUDES := $(llvm_libc++_export_includes)
+LOCAL_EXPORT_CPPFLAGS := $(llvm_libc++_export_cxxflags)
+LOCAL_STATIC_LIBRARIES := llvm_libc++_support_android
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := llvm_libc++_shared
+LOCAL_SRC_FILES := $(llvm_libc++_sources)
+LOCAL_C_INCLUDES := $(llvm_libc++_includes)
+LOCAL_CPPFLAGS := $(llvm_libc++_cxxflags)
+LOCAL_CPP_FEATURES := rtti exceptions
+LOCAL_EXPORT_C_INCLUDES := $(llvm_libc++_export_includes)
+LOCAL_EXPORT_CPPFLAGS := $(llvm_libc++_export_cxxflags)
+LOCAL_STATIC_LIBRARIES := llvm_libc++_support_android
+include $(BUILD_SHARED_LIBRARY)
+
+include $(LOCAL_PATH)/android/support/Android.mk
diff --git a/sources/cxx-stl/llvm-libc++/CMakeLists.txt b/sources/cxx-stl/llvm-libc++/CMakeLists.txt
deleted file mode 100644
index b793e6e..0000000
--- a/sources/cxx-stl/llvm-libc++/CMakeLists.txt
+++ /dev/null
@@ -1,220 +0,0 @@
-# See www/CMake.html for instructions on how to build libcxx with CMake.
-
-#===============================================================================
-# Setup Project
-#===============================================================================
-
-project(libcxx CXX C)
-cmake_minimum_required(VERSION 2.8)
-
-set(PACKAGE_NAME libcxx)
-set(PACKAGE_VERSION trunk-svn)
-set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
-set(PACKAGE_BUGREPORT "llvmbugs@cs.uiuc.edu")
-
-# Add path for custom modules
-set(CMAKE_MODULE_PATH
-  ${CMAKE_MODULE_PATH}
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
-  )
-
-# Require out of source build.
-include(MacroEnsureOutOfSourceBuild)
-MACRO_ENSURE_OUT_OF_SOURCE_BUILD(
- "${PROJECT_NAME} requires an out of source build. Please create a separate
- build directory and run 'cmake /path/to/${PROJECT_NAME} [options]' there."
- )
-
-#===============================================================================
-# Setup CMake Options
-#===============================================================================
-
-# Define options.
-option(LIBCXX_ENABLE_EXCEPTIONS "Use exceptions." ON)
-option(LIBCXX_ENABLE_RTTI "Use run time type information." ON)
-option(LIBCXX_ENABLE_ASSERTIONS "Enable assertions independent of build mode." ON)
-option(LIBCXX_ENABLE_PEDANTIC "Compile with pedantic enabled." ON)
-option(LIBCXX_ENABLE_WERROR "Fail and stop if a warning is triggered." OFF)
-option(LIBCXX_ENABLE_CXX0X "Enable -std=c++0x and use of c++0x language features if the compiler supports it." ON)
-option(LIBCXX_ENABLE_SHARED "Build libc++ as a shared library." ON)
-
-set(CXXABIS none libcxxabi libcxxrt libsupc++)
-if (NOT DEFINED LIBCXX_CXX_ABI)
-  set(LIBCXX_CXX_ABI "none")
-endif()
-set(LIBCXX_CXX_ABI "${LIBCXX_CXX_ABI}" CACHE STRING
-    "Specify C++ ABI library to use." FORCE)
-set_property(CACHE LIBCXX_CXX_ABI PROPERTY STRINGS "";${CXXABIS})
-
-#===============================================================================
-# Configure System
-#===============================================================================
-
-# Get triples.
-include(GetTriple)
-get_host_triple(LIBCXX_HOST_TRIPLE
-  LIBCXX_HOST_ARCH
-  LIBCXX_HOST_VENDOR
-  LIBCXX_HOST_OS
-  )
-set(LIBCXX_HOST_TRIPLE ${LIBCXX_HOST_TRIPLE} CACHE STRING "Host triple.")
-get_target_triple(LIBCXX_TARGET_TRIPLE
-  LIBCXX_TARGET_ARCH
-  LIBCXX_TARGET_VENDOR
-  LIBCXX_TARGET_OS
-  )
-set(LIBCXX_TARGET_TRIPLE ${LIBCXX_TARGET_TRIPLE} CACHE STRING "Target triple.")
-
-if ("${LIBCXX_CXX_ABI}" STREQUAL "libsupc++")
-  set(LIBCXX_LIBSUPCXX_INCLUDE_PATHS "${LIBCXX_LIBSUPCXX_INCLUDE_PATHS}"
-      CACHE STRINGS
-      "Paths to libsupc++ include directories separate by ';'.")
-  set(LIBCXX_CXX_ABI_LIBRARIES supc++)
-  set(LIBCXX_LIBSUPCXX_FILES
-      cxxabi.h
-      bits/c++config.h
-      bits/os_defines.h
-      bits/cpu_defines.h
-      bits/cxxabi_tweaks.h
-      bits/cxxabi_forced.h
-      )
-  # Create include directories.
-  file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/include")
-  file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/include/bits")
-  set(LIBCXX_LIBSUPCXX_FILE_PATHS)
-  foreach(path ${LIBCXX_LIBSUPCXX_FILES})
-    set(found FALSE)
-    foreach(incpath ${LIBCXX_LIBSUPCXX_INCLUDE_PATHS})
-      if (EXISTS "${incpath}/${path}")
-        set(found TRUE)
-        get_filename_component(dstdir ${path} PATH)
-        get_filename_component(file ${path} NAME)
-        add_custom_command(
-          OUTPUT "${CMAKE_BINARY_DIR}/include/${dstdir}/${file}"
-          COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                    "${incpath}/${path}"
-                    "${CMAKE_BINARY_DIR}/include/${dstdir}"
-          MAIN_DEPENDENCY "${incpath}/${path}"
-          )
-        list(APPEND LIBCXX_CXX_ABI_DEPS
-                    "${CMAKE_BINARY_DIR}/include/${dstdir}/${file}")
-      endif()
-    endforeach()
-    if (NOT found)
-      message(FATAL_ERROR "Failed to find ${path}")
-    endif()
-  endforeach()
-  add_custom_target(supcxx_headers DEPENDS ${LIBCXX_CXX_ABI_DEPS})
-  set(LIBCXX_CXX_ABI_DEPS supcxx_headers)
-  include_directories("${CMAKE_BINARY_DIR}/include")
-  install(DIRECTORY "${CMAKE_BINARY_DIR}/include/"
-    DESTINATION include/c++/v1
-    FILES_MATCHING
-    PATTERN "*"
-    )
-elseif (NOT "${LIBCXX_CXX_ABI}" STREQUAL "none")
-  message(FATAL_ERROR
-          "Currently only none and libsupc++ are supported for c++ abi.")
-endif ()
-
-# Configure compiler.
-include(config-ix)
-
-#===============================================================================
-# Setup Compiler Flags
-#===============================================================================
-
-# Get required flags.
-# On all systems the system c++ standard library headers need to be excluded.
-if (MSVC)
-  # MSVC only has -X, which disables all default includes; including the crt.
-  # Thus, we do nothing and hope we don't accidentally include any of the C++
-  # headers.
-else()
-  if (LIBCXX_HAS_NOSTDINCXX_FLAG)
-    set(LIBCXX_CXX_REQUIRED_FLAGS -nostdinc++)
-  endif()
-  if (LIBCXX_ENABLE_CXX0X AND LIBCXX_HAS_STDCXX0X_FLAG)
-    list(APPEND LIBCXX_CXX_REQUIRED_FLAGS -std=c++0x)
-  endif()
-endif()
-
-macro(append_if list condition var)
-  if (${condition})
-    list(APPEND ${list} ${var})
-  endif()
-endmacro()
-
-# Get warning flags
-append_if(LIBCXX_CXX_WARNING_FLAGS LIBCXX_HAS_WALL_FLAG -Wall)
-append_if(LIBCXX_CXX_WARNING_FLAGS LIBCXX_HAS_W_FLAG -W)
-append_if(LIBCXX_CXX_WARNING_FLAGS LIBCXX_HAS_WNO_UNUSED_PARAMETER_FLAG -Wno-unused-parameter)
-append_if(LIBCXX_CXX_WARNING_FLAGS LIBCXX_HAS_WWRITE_STRINGS_FLAG -Wwrite-strings)
-append_if(LIBCXX_CXX_WARNING_FLAGS LIBCXX_HAS_WNO_LONG_LONG_FLAG -Wno-long-long)
-if (LIBCXX_ENABLE_WERROR)
-  append_if(LIBCXX_CXX_WARNING_FLAGS LIBCXX_HAS_WERROR_FLAG -Werror)
-  append_if(LIBCXX_CXX_WARNING_FLAGS LIBCXX_HAS_WX_FLAG -WX)
-endif()
-if (LIBCXX_ENABLE_PEDANTIC)
-  append_if(LIBCXX_CXX_WARNING_FLAGS LIBCXX_HAS_PEDANTIC_FLAG -pedantic)
-endif()
-
-# Get feature flags.
-# Exceptions
-if (LIBCXX_ENABLE_EXCEPTIONS)
-  # Catches C++ exceptions only and tells the compiler to assume that extern C
-  # functions never throw a C++ exception.
-  append_if(LIBCXX_CXX_FEATURE_FLAGS LIBCXX_HAS_EHSC_FLAG -EHsc)
-else()
-  list(APPEND LIBCXX_CXX_FEATURE_FLAGS -D_LIBCPP_NO_EXCEPTIONS)
-  append_if(LIBCXX_CXX_FEATURE_FLAGS LIBCXX_HAS_NO_EHS_FLAG -EHs-)
-  append_if(LIBCXX_CXX_FEATURE_FLAGS LIBCXX_HAS_NO_EHA_FLAG -EHa-)
-  append_if(LIBCXX_CXX_FEATURE_FLAGS LIBCXX_HAS_FNO_EXCEPTIONS_FLAG -fno-exceptions)
-endif()
-# RTTI
-if (NOT LIBCXX_ENABLE_RTTI)
-  list(APPEND LIBCXX_CXX_FEATURE_FLAGS -D_LIBCPP_NO_RTTI)
-  append_if(LIBCXX_CXX_FEATURE_FLAGS LIBCXX_HAS_NO_GR_FLAG -GR-)
-  append_if(LIBCXX_CXX_FEATURE_FLAGS LIBCXX_HAS_FNO_RTTI_FLAG -fno-rtti)
-endif()
-# Assert
-string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
-if (LIBCXX_ENABLE_ASSERTIONS)
-  # MSVC doesn't like _DEBUG on release builds. See PR 4379.
-  if (NOT MSVC)
-    list(APPEND LIBCXX_CXX_FEATURE_FLAGS -D_DEBUG)
-  endif()
-  # On Release builds cmake automatically defines NDEBUG, so we
-  # explicitly undefine it:
-  if (uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE")
-    list(APPEND LIBCXX_CXX_FEATURE_FLAGS -UNDEBUG)
-  endif()
-else()
-  if (NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE")
-    list(APPEND LIBCXX_CXX_FEATURE_FLAGS -DNDEBUG)
-  endif()
-endif()
-
-# This is the _ONLY_ place where add_definitions is called.
-add_definitions(
- ${LIBCXX_CXX_REQUIRED_FLAGS}
- ${LIBCXX_CXX_WARNING_FLAGS}
- ${LIBCXX_CXX_FEATURE_FLAGS}
- )
-
-#===============================================================================
-# Setup Source Code
-#===============================================================================
-
-include_directories(include)
-
-# Add source code. This also contains all of the logic for deciding linker flags
-# soname, etc...
-add_subdirectory(lib)
-
-#===============================================================================
-# Setup Tests
-#===============================================================================
-
-add_subdirectory(test)
diff --git a/sources/cxx-stl/llvm-libc++/Makefile b/sources/cxx-stl/llvm-libc++/Makefile
deleted file mode 100644
index 182dcc3..0000000
--- a/sources/cxx-stl/llvm-libc++/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-##
-# libcpp Makefile
-##
-
-SRCDIRS = .
-DESTDIR = $(DSTROOT)
-
-OBJROOT=.
-SYMROOT=.
-export TRIPLE=-apple-
-
-ifeq (,$(RC_INDIGO))
-	INSTALL_PREFIX=""
-else
-	INSTALL_PREFIX="$(SDKROOT)"
-endif
-INSTALL_DIR=$(DSTROOT)/$(INSTALL_PREFIX)
-
-.PHONY: help installsrc clean installheaders install
-
-help::
-	@echo "Use make install DSTROOT=<destination>"
-
-installsrc:: $(SRCROOT)
-
-	ditto $(SRCDIRS)/include $(SRCROOT)/include
-	ditto $(SRCDIRS)/lib $(SRCROOT)/lib
-	ditto $(SRCDIRS)/src $(SRCROOT)/src
-	ditto $(SRCDIRS)/Makefile $(SRCROOT)/Makefile
-
-clean::
-
-# The installheaders target is used by clang's runtime/libcxx makefile.
-installheaders::
-	mkdir -p $(HEADER_DIR)/c++/v1/ext
-	rsync -r --exclude=".*" --exclude="support" $(SRCDIRS)/include/* \
-	  $(HEADER_DIR)/c++/v1/
-	chown -R root:wheel $(HEADER_DIR)/c++
-	chmod 755 $(HEADER_DIR)/c++/v1
-	chmod 644 $(HEADER_DIR)/c++/v1/*
-	chmod 755 $(HEADER_DIR)/c++/v1/ext
-	chmod 644 $(HEADER_DIR)/c++/v1/ext/*
-
-install::
-
-	cd lib && ./buildit
-	ditto lib/libc++.1.dylib $(SYMROOT)/usr/lib/libc++.1.dylib
-	cd lib && dsymutil -o $(SYMROOT)/libc++.1.dylib.dSYM \
-	  $(SYMROOT)/usr/lib/libc++.1.dylib
-	mkdir -p $(INSTALL_DIR)/usr/lib
-	strip -S -o $(INSTALL_DIR)/usr/lib/libc++.1.dylib \
-	  $(SYMROOT)/usr/lib/libc++.1.dylib
-	cd $(INSTALL_DIR)/usr/lib && ln -s libc++.1.dylib libc++.dylib
diff --git a/sources/cxx-stl/llvm-libc++/README.NDK b/sources/cxx-stl/llvm-libc++/README.NDK
new file mode 100644
index 0000000..d979ab4
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/README.NDK
@@ -0,0 +1,94 @@
+This is a copy of LLVM's libc++ project, slightly modified to build
+with this NDK. *EXPERIMENTAL* *BROKEN* *DO* *NOT* *USE*.
+
+Upstream: See 'upstream.config' file in this directory.
+Patches: see patches.android/
+Tracking: 36496
+
+This is a version of LLVM's libc++ that was modified to be built
+with GAbi++. At the moment, only linking a small test executable is
+supported, and it will very likely crash as soon as you start it.
+
+It also includes Android-specific support code, providing missing C
+library functionality, under android/support. Most of the code there
+consists in stubs waiting for a real implementation.
+
+All patches are under patches.android/ to make it easier to update
+the upstream revision of the library while working on this.
+
+You need a recent NDK release, one which provides a version
+of the GAbi++ C++ runtime that supports rtti _and_ exceptions.
+
+Build instructions:
+
+  1/ Set NDK to the path of a recent Android NDK install path
+     (Use Android NDK r8e or above), e.g.:
+
+      NDK=$HOME/android/ndk-r8e
+
+  2/ From the top-level directory, do:
+
+      $NDK/ndk-build -C android/test
+
+     This is actually equivalent to:
+
+      cd android/test
+      $NDK/ndk-build
+
+  3/ To see build commands, use V=1, as in:
+
+      $NDK/ndk-build -C android/test V=1
+
+
+Android support files:
+
+  android/support/include:
+     Android system header wrappers, to add missing declarations
+
+  android/support/src:
+     Put the implementation of the missing system functions here.
+
+  Android.mk:
+     Main build file for the library. This builds one static and
+     one shared version of the library.
+
+     If modifications are not obvious, read $NDK/docs/ANDROID-MK.html
+     for a description of the Android.mk format.
+
+  android/test/jni:
+     NDK build project for two test programs that link against the
+     static and shared versions of the library.
+
+     See the Android.mk and Application.mk files in this directory
+     if you want to add new test files.
+
+
+Toolchain selection:
+  By default, ndk-build tries to build with GCC 4.6, however, experimental
+  versions of GCC 4.7 and Clang 3.1 are available with recent NDK releases.
+
+  Use the NDK_TOOLCHAIN_VERSION environment variable to switch to a
+  different one, valid examples:
+
+
+    export NDK_TOOLCHAIN_VERSION=4.6    # this is the default
+    $NDK/ndk-build -C android/test
+
+    # This is equivalent, but for GCC 4.7
+    $NDK/ndk-build -C android/test NDK_TOOLCHAIN_VERSION=4.7
+
+    # Also equivalent, but for Clang 3.1
+    NDK_TOOLCHAIN_VERSION=Clang3.1 $NDK/ndk-build -C android/test
+
+
+Updating the sources to a newer revision:
+
+  You can use the tools/update-upstream.sh script to automatically try
+  to update to a more recent version of the upstream sources.
+
+  In case of success, this adds all relevant changes to the current git
+  index so you can review them before committing them.
+
+  In case of problem, try using the --verbose and --no-cleanup options
+  to see the details of the failure. This may require manually updating
+  the patch files.
diff --git a/sources/cxx-stl/llvm-libc++/android/README b/sources/cxx-stl/llvm-libc++/android/README
deleted file mode 100644
index c9c9042..0000000
--- a/sources/cxx-stl/llvm-libc++/android/README
+++ /dev/null
@@ -1,66 +0,0 @@
-This directory contains support files to build libc++ with
-the Android NDK for ARM, x86 and MIPS.
-
-You need a recent NDK release, one which provides a version
-of the GAbi++ C++ runtime that supports rtti _and_ exceptions.
-
-Build instructions:
-
-  1/ Set NDK to the path of a recent Android NDK install path
-     (Use Android NDK r8c or above), e.g.:
-
-      NDK=$HOME/android/ndk-r8c
-
-  2/ From the top-level directory, do:
-
-      $NDK/ndk-build -C android/test
-
-     This is actually equivalent to:
-
-      cd android/test
-      $NDK/ndk-build
-
-  3/ To see build commands, use V=1, as in:
-
-      $NDK/ndk-build -C android/test V=1
-
-
-Android support files:
-
-  include/support/android:
-     Android system header wrappers, to add missing declarations
-
-  src/support/android:
-     Put the implementation of the missing system functions here.
-
-  android/llvm-libc++/Android.mk:
-     Main build file for the library. This builds one static and
-     one shared version of the library.
-
-     If modifications are not obvious, read $NDK/docs/ANDROID-MK.html
-     for a description of the Android.mk format.
-
-  android/test/jni:
-     NDK build project for two test programs that link against the
-     static and shared versions of the library.
-
-     See the Android.mk and Application.mk files in this directory
-     if you want to add new test files.
-
-
-Toolchain selection:
-  By default, ndk-build tries to build with GCC 4.6, however, experimental
-  versions of GCC 4.7 and Clang 3.1 are available with recent NDK releases.
-
-  Use the NDK_TOOLCHAIN_VERSION environment variable to switch to a
-  different one, valid examples:
-
-
-    export NDK_TOOLCHAIN_VERSION=4.6    # this is the default
-    $NDK/ndk-build -C android/test
-
-    # This is equivalent, but for GCC 4.7
-    $NDK/ndk-build -C android/test NDK_TOOLCHAIN_VERSION=4.7
-
-    # Also equivalent, but for Clang 3.1
-    NDK_TOOLCHAIN_VERSION=Clang3.1 $NDK/ndk-build -C android/test
diff --git a/sources/cxx-stl/llvm-libc++/android/llvm-libc++/Android.mk b/sources/cxx-stl/llvm-libc++/android/llvm-libc++/Android.mk
deleted file mode 100644
index 191bfb8..0000000
--- a/sources/cxx-stl/llvm-libc++/android/llvm-libc++/Android.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-# This file is dual licensed under the MIT and the University of Illinois Open
-# Source Licenses. See LICENSE.TXT for details.
-
-LOCAL_PATH := $(call my-dir)/../..
-
-llvm_libc++_includes := $(LOCAL_PATH)/include $(LOCAL_PATH)/include/support/android
-llvm_libc++_export_includes := $(llvm_libc++_includes)
-llvm_libc++_sources := \
-	algorithm.cpp \
-	bind.cpp \
-	chrono.cpp \
-	condition_variable.cpp \
-	debug.cpp \
-	exception.cpp \
-	future.cpp \
-	hash.cpp \
-	ios.cpp \
-	iostream.cpp \
-	locale.cpp \
-	memory.cpp \
-	mutex.cpp \
-	new.cpp \
-	random.cpp \
-	regex.cpp \
-	stdexcept.cpp \
-	string.cpp \
-	strstream.cpp \
-	system_error.cpp \
-	thread.cpp \
-	typeinfo.cpp \
-	utility.cpp \
-	valarray.cpp
-
-llvm_libc++_sources += \
-    support/android/locale_support.c \
-    support/android/nl_types_support.c \
-    support/android/stdlib_support.c \
-    support/android/wchar_support.c \
-    support/android/wctype_support.c
-
-llvm_libc++_sources := $(llvm_libc++_sources:%=src/%)
-llvm_libc++_export_cxxflags := -std=c++11
-llvm_libc++_cxxflags := $(llvm_libc++_export_cxxflags) \
-    -DGABIXX_LIBCXX=1 -DLIBCXXRT=1
-
-include $(dir $(LOCAL_PATH))../../gabi++/sources.mk
-llvm_libc++_includes += $(libgabi++_c_includes)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := llvm_libc++_static
-LOCAL_SRC_FILES := $(llvm_libc++_sources)
-LOCAL_SRC_FILES += $(libgabi++_src_files:%=../gabi++/%)
-LOCAL_C_INCLUDES := $(llvm_libc++_includes)
-LOCAL_CPPFLAGS := $(llvm_libc++_cxxflags)
-LOCAL_CPP_FEATURES := rtti exceptions
-LOCAL_EXPORT_C_INCLUDES := $(llvm_libc++_export_includes)
-LOCAL_EXPORT_CPPFLAGS := $(llvm_libc++_export_cxxflags)
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := llvm_libc++_shared
-LOCAL_SRC_FILES := $(llvm_libc++_sources)
-LOCAL_SRC_FILES += $(libgabi++_src_files:%=../gabi++/%)
-LOCAL_C_INCLUDES := $(llvm_libc++_includes)
-LOCAL_CPPFLAGS := $(llvm_libc++_cxxflags) -DGABIXX_LIBCXX=1 -DLIBCXXRT=1
-LOCAL_CPP_FEATURES := rtti exceptions
-LOCAL_EXPORT_C_INCLUDES := $(llvm_libc++_export_includes)
-LOCAL_EXPORT_CPPFLAGS := $(llvm_libc++_export_cxxflags)
-include $(BUILD_SHARED_LIBRARY)
diff --git a/sources/cxx-stl/llvm-libc++/android/support/Android.mk b/sources/cxx-stl/llvm-libc++/android/support/Android.mk
new file mode 100644
index 0000000..472ac8a
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/android/support/Android.mk
@@ -0,0 +1,17 @@
+LOCAL_PATH := $(call my-dir)
+
+android_support_c_includes := $(LOCAL_PATH)/include
+
+android_support_sources := \
+    src/locale_support.c \
+    src/nl_types_support.c \
+    src/stdlib_support.c \
+    src/wchar_support.c \
+    src/wctype_support.c \
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := llvm_libc++_support_android
+LOCAL_SRC_FILES := $(android_support_sources)
+LOCAL_C_INCLUDES := $(android_support_c_includes)
+LOCAL_EXPORT_C_INCLUDES := $(android_support_c_includes)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/sources/cxx-stl/llvm-libc++/include/support/android/ctype.h b/sources/cxx-stl/llvm-libc++/android/support/include/ctype.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/android/ctype.h
rename to sources/cxx-stl/llvm-libc++/android/support/include/ctype.h
diff --git a/sources/cxx-stl/llvm-libc++/include/support/android/langinfo.h b/sources/cxx-stl/llvm-libc++/android/support/include/langinfo.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/android/langinfo.h
rename to sources/cxx-stl/llvm-libc++/android/support/include/langinfo.h
diff --git a/sources/cxx-stl/llvm-libc++/include/support/android/locale.h b/sources/cxx-stl/llvm-libc++/android/support/include/locale.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/android/locale.h
rename to sources/cxx-stl/llvm-libc++/android/support/include/locale.h
diff --git a/sources/cxx-stl/llvm-libc++/include/support/android/math.h b/sources/cxx-stl/llvm-libc++/android/support/include/math.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/android/math.h
rename to sources/cxx-stl/llvm-libc++/android/support/include/math.h
diff --git a/sources/cxx-stl/llvm-libc++/include/support/android/nl_types.h b/sources/cxx-stl/llvm-libc++/android/support/include/nl_types.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/android/nl_types.h
rename to sources/cxx-stl/llvm-libc++/android/support/include/nl_types.h
diff --git a/sources/cxx-stl/llvm-libc++/include/support/android/stdio.h b/sources/cxx-stl/llvm-libc++/android/support/include/stdio.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/android/stdio.h
rename to sources/cxx-stl/llvm-libc++/android/support/include/stdio.h
diff --git a/sources/cxx-stl/llvm-libc++/include/support/android/stdlib.h b/sources/cxx-stl/llvm-libc++/android/support/include/stdlib.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/android/stdlib.h
rename to sources/cxx-stl/llvm-libc++/android/support/include/stdlib.h
diff --git a/sources/cxx-stl/llvm-libc++/include/support/android/string.h b/sources/cxx-stl/llvm-libc++/android/support/include/string.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/android/string.h
rename to sources/cxx-stl/llvm-libc++/android/support/include/string.h
diff --git a/sources/cxx-stl/llvm-libc++/include/support/android/time.h b/sources/cxx-stl/llvm-libc++/android/support/include/time.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/android/time.h
rename to sources/cxx-stl/llvm-libc++/android/support/include/time.h
diff --git a/sources/cxx-stl/llvm-libc++/include/support/android/wchar.h b/sources/cxx-stl/llvm-libc++/android/support/include/wchar.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/android/wchar.h
rename to sources/cxx-stl/llvm-libc++/android/support/include/wchar.h
diff --git a/sources/cxx-stl/llvm-libc++/include/support/android/wctype.h b/sources/cxx-stl/llvm-libc++/android/support/include/wctype.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/android/wctype.h
rename to sources/cxx-stl/llvm-libc++/android/support/include/wctype.h
diff --git a/sources/cxx-stl/llvm-libc++/include/support/android/xlocale.h b/sources/cxx-stl/llvm-libc++/android/support/include/xlocale.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/android/xlocale.h
rename to sources/cxx-stl/llvm-libc++/android/support/include/xlocale.h
diff --git a/sources/cxx-stl/llvm-libc++/src/support/android/locale_support.c b/sources/cxx-stl/llvm-libc++/android/support/src/locale_support.c
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/support/android/locale_support.c
rename to sources/cxx-stl/llvm-libc++/android/support/src/locale_support.c
diff --git a/sources/cxx-stl/llvm-libc++/src/support/android/nl_types_support.c b/sources/cxx-stl/llvm-libc++/android/support/src/nl_types_support.c
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/support/android/nl_types_support.c
rename to sources/cxx-stl/llvm-libc++/android/support/src/nl_types_support.c
diff --git a/sources/cxx-stl/llvm-libc++/src/support/android/stdlib_support.c b/sources/cxx-stl/llvm-libc++/android/support/src/stdlib_support.c
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/support/android/stdlib_support.c
rename to sources/cxx-stl/llvm-libc++/android/support/src/stdlib_support.c
diff --git a/sources/cxx-stl/llvm-libc++/src/support/android/wchar_support.c b/sources/cxx-stl/llvm-libc++/android/support/src/wchar_support.c
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/support/android/wchar_support.c
rename to sources/cxx-stl/llvm-libc++/android/support/src/wchar_support.c
diff --git a/sources/cxx-stl/llvm-libc++/src/support/android/wctype_support.c b/sources/cxx-stl/llvm-libc++/android/support/src/wctype_support.c
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/support/android/wctype_support.c
rename to sources/cxx-stl/llvm-libc++/android/support/src/wctype_support.c
diff --git a/sources/cxx-stl/llvm-libc++/android/test/jni/Android.mk b/sources/cxx-stl/llvm-libc++/android/test/jni/Android.mk
index aff740c..98bcd75 100644
--- a/sources/cxx-stl/llvm-libc++/android/test/jni/Android.mk
+++ b/sources/cxx-stl/llvm-libc++/android/test/jni/Android.mk
@@ -16,4 +16,4 @@
 LOCAL_STATIC_LIBRARIES := llvm_libc++_static
 include $(BUILD_EXECUTABLE)
 
-include $(LOCAL_PATH)/../../llvm-libc++/Android.mk
+include $(LOCAL_PATH)/../../../Android.mk
diff --git a/sources/cxx-stl/llvm-libc++/cmake/Modules/GetTriple.cmake b/sources/cxx-stl/llvm-libc++/cmake/Modules/GetTriple.cmake
deleted file mode 100644
index c555931..0000000
--- a/sources/cxx-stl/llvm-libc++/cmake/Modules/GetTriple.cmake
+++ /dev/null
@@ -1,53 +0,0 @@
-# Define functions to get the host and target triple.
-
-function(get_host_triple out out_arch out_vendor out_os)
-  # Get the architecture.
-  set(arch ${CMAKE_HOST_SYSTEM_PROCESSOR})
-  if (arch STREQUAL "x86")
-    set(arch "i686")
-  endif()
-  # Get the vendor.
-  if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin")
-    set(vendor "apple")
-  else()
-    set(vendor "pc")
-  endif()
-  # Get os.
-  if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
-    set(os "win32")
-  else()
-    string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} os)
-  endif()
-  set(triple "${arch}-${vendor}-${os}")
-  set(${out} ${triple} PARENT_SCOPE)
-  set(${out_arch} ${arch} PARENT_SCOPE)
-  set(${out_vendor} ${vendor} PARENT_SCOPE)
-  set(${out_os} ${os} PARENT_SCOPE)
-  message(STATUS "Host triple: ${triple}")
-endfunction()
-
-function(get_target_triple out out_arch out_vendor out_os)
-  # Get the architecture.
-  set(arch ${CMAKE_SYSTEM_PROCESSOR})
-  if (arch STREQUAL "x86")
-    set(arch "i686")
-  endif()
-  # Get the vendor.
-  if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-    set(vendor "apple")
-  else()
-    set(vendor "pc")
-  endif()
-  # Get os.
-  if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-    set(os "win32")
-  else()
-    string(TOLOWER ${CMAKE_SYSTEM_NAME} os)
-  endif()
-  set(triple "${arch}-${vendor}-${os}")
-  set(${out} ${triple} PARENT_SCOPE)
-  set(${out_arch} ${arch} PARENT_SCOPE)
-  set(${out_vendor} ${vendor} PARENT_SCOPE)
-  set(${out_os} ${os} PARENT_SCOPE)
-  message(STATUS "Target triple: ${triple}")
-endfunction()
diff --git a/sources/cxx-stl/llvm-libc++/cmake/Modules/MacroEnsureOutOfSourceBuild.cmake b/sources/cxx-stl/llvm-libc++/cmake/Modules/MacroEnsureOutOfSourceBuild.cmake
deleted file mode 100644
index a066936..0000000
--- a/sources/cxx-stl/llvm-libc++/cmake/Modules/MacroEnsureOutOfSourceBuild.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-# MACRO_ENSURE_OUT_OF_SOURCE_BUILD(<errorMessage>)
-
-macro( MACRO_ENSURE_OUT_OF_SOURCE_BUILD _errorMessage )
-
-string( COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" _insource )
-if( _insource )
- message( SEND_ERROR "${_errorMessage}" )
- message( FATAL_ERROR
- "In-source builds are not allowed.
- CMake would overwrite the makefiles distributed with Compiler-RT.
- Please create a directory and run cmake from there, passing the path
- to this source directory as the last argument.
- This process created the file `CMakeCache.txt' and the directory `CMakeFiles'.
- Please delete them."
- )
-endif( _insource )
-
-endmacro( MACRO_ENSURE_OUT_OF_SOURCE_BUILD )
diff --git a/sources/cxx-stl/llvm-libc++/cmake/config-ix.cmake b/sources/cxx-stl/llvm-libc++/cmake/config-ix.cmake
deleted file mode 100644
index 977acdc..0000000
--- a/sources/cxx-stl/llvm-libc++/cmake/config-ix.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-include(CheckLibraryExists)
-include(CheckCXXCompilerFlag)
-
-# Check compiler flags
-check_cxx_compiler_flag(-std=c++0x            LIBCXX_HAS_STDCXX0X_FLAG)
-check_cxx_compiler_flag(-fPIC                 LIBCXX_HAS_FPIC_FLAG)
-check_cxx_compiler_flag(-nodefaultlibs        LIBCXX_HAS_NODEFAULTLIBS_FLAG)
-check_cxx_compiler_flag(-nostdinc++           LIBCXX_HAS_NOSTDINCXX_FLAG)
-check_cxx_compiler_flag(-Wall                 LIBCXX_HAS_WALL_FLAG)
-check_cxx_compiler_flag(-W                    LIBCXX_HAS_W_FLAG)
-check_cxx_compiler_flag(-Wno-unused-parameter LIBCXX_HAS_WNO_UNUSED_PARAMETER_FLAG)
-check_cxx_compiler_flag(-Wwrite-strings       LIBCXX_HAS_WWRITE_STRINGS_FLAG)
-check_cxx_compiler_flag(-Wno-long-long        LIBCXX_HAS_WNO_LONG_LONG_FLAG)
-check_cxx_compiler_flag(-pedantic             LIBCXX_HAS_PEDANTIC_FLAG)
-check_cxx_compiler_flag(-Werror               LIBCXX_HAS_WERROR_FLAG)
-check_cxx_compiler_flag(-fno-exceptions       LIBCXX_HAS_FNO_EXCEPTIONS_FLAG)
-check_cxx_compiler_flag(-fno-rtti             LIBCXX_HAS_FNO_RTTI_FLAG)
-check_cxx_compiler_flag(/WX                   LIBCXX_HAS_WX_FLAG)
-check_cxx_compiler_flag(/EHsc                 LIBCXX_HAS_EHSC_FLAG)
-check_cxx_compiler_flag(/EHs-                 LIBCXX_HAS_NO_EHS_FLAG)
-check_cxx_compiler_flag(/EHa-                 LIBCXX_HAS_NO_EHA_FLAG)
-check_cxx_compiler_flag(/GR-                  LIBCXX_HAS_NO_GR_FLAG)
-
-# Check libraries
-check_library_exists(pthread pthread_create "" LIBCXX_HAS_PTHREAD_LIB)
-check_library_exists(c printf "" LIBCXX_HAS_C_LIB)
-check_library_exists(m ccos "" LIBCXX_HAS_M_LIB)
-check_library_exists(rt clock_gettime "" LIBCXX_HAS_RT_LIB)
-check_library_exists(gcc_s __gcc_personality_v0 "" LIBCXX_HAS_GCC_S_LIB)
-
-# Check C++0x features
-if (LIBCXX_ENABLE_CXX0X)
-  if (LIBCXX_HAS_STDCXX0X_FLAG)
-    set(CMAKE_REQUIRED_DEFINITIONS -std=c++0x)
-  endif()
-else()
-  set(LIBCXX_HAS_STDCXX0X_FLAG FALSE)
-endif()
diff --git a/sources/cxx-stl/llvm-libc++/lib/CMakeLists.txt b/sources/cxx-stl/llvm-libc++/lib/CMakeLists.txt
deleted file mode 100644
index 4ee1f4d..0000000
--- a/sources/cxx-stl/llvm-libc++/lib/CMakeLists.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-# Get sources
-file(GLOB LIBCXX_SOURCES ../src/*.cpp)
-if(WIN32)
-  file(GLOB LIBCXX_WIN32_SOURCES ../src/support/win32/*.cpp)
-  list(APPEND LIBCXX_SOURCES ${LIBCXX_WIN32_SOURCES})
-endif()
-
-# Add all the headers to the project for IDEs.
-if (MSVC_IDE OR XCODE)
-  file(GLOB_RECURSE LIBCXX_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/*)
-  if(WIN32)
-    file( GLOB LIBCXX_WIN32_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/support/win32/*.h)
-    list(APPEND LIBCXX_HEADERS ${LIBCXX_WIN32_HEADERS})
-  endif()
-  # Force them all into the headers dir on MSVC, otherwise they end up at
-  # project scope because they don't have extensions.
-  if (MSVC_IDE)
-    source_group("Header Files" FILES ${LIBCXX_HEADERS})
-  endif()
-endif()
-
-if (LIBCXX_ENABLE_SHARED)
-  add_library(cxx SHARED
-    ${LIBCXX_SOURCES}
-    ${LIBCXX_HEADERS}
-    )
-else()
-  add_library(cxx STATIC
-    ${LIBCXX_SOURCES}
-    ${LIBCXX_HEADERS}
-    )
-endif()
-
-if (DEFINED LIBCXX_CXX_ABI_DEPS)
-  add_dependencies(cxx ${LIBCXX_CXX_ABI_DEPS})
-endif()
-
-# Generate library list.
-set(libraries ${LIBCXX_CXX_ABI_LIBRARIES})
-append_if(libraries LIBCXX_HAS_PTHREAD_LIB pthread)
-append_if(libraries LIBCXX_HAS_C_LIB c)
-append_if(libraries LIBCXX_HAS_M_LIB m)
-append_if(libraries LIBCXX_HAS_RT_LIB rt)
-append_if(libraries LIBCXX_HAS_GCC_S_LIB gcc_s)
-
-target_link_libraries(cxx ${libraries})
-
-# Setup flags.
-append_if(compile_flags LIBCXX_HAS_FPIC_FLAG -fPIC)
-append_if(link_flags LIBCXX_HAS_NODEFAULTLIBS_FLAG -nodefaultlibs)
-
-set_target_properties(cxx
-  PROPERTIES
-    COMPILE_FLAGS "${compile_flags}"
-    LINK_FLAGS    "${link_flags}"
-    OUTPUT_NAME   "c++"
-    VERSION       "1.0"
-    SOVERSION     "1"
-  )
-
-install(TARGETS cxx
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-  )
-
-install(DIRECTORY ../include/
-  DESTINATION include/c++/v1
-  FILES_MATCHING
-  PATTERN "*"
-  PATTERN ".svn" EXCLUDE
-  )
diff --git a/sources/cxx-stl/llvm-libc++/lib/buildit b/sources/cxx-stl/llvm-libc++/lib/buildit
deleted file mode 100755
index 0b1f6e5..0000000
--- a/sources/cxx-stl/llvm-libc++/lib/buildit
+++ /dev/null
@@ -1,125 +0,0 @@
-#! /bin/sh
-#
-# Set the $TRIPLE environment variable to your system's triple before
-# running this script.  If you set $CXX, that will be used to compile
-# the library.  Otherwise we'll use clang++.
-
-set -e
-
-if [ `basename $(pwd)` != "lib" ]
-then
-	echo "current directory must be lib"
-	exit 1
-fi
-
-if [ -z "$CXX" ]
-then
-	CXX=clang++
-fi
-
-if [ -z "$CC" ]
-then
-    CC=clang
-fi
-
-if [ -z $MACOSX_DEPLOYMENT_TARGET ]
-then
-	if [ -z $IPHONEOS_DEPLOYMENT_TARGET ]
-	then
-		MACOSX_DEPLOYMENT_TARGET=10.7
-	fi
-fi
-
-if [ -z $RC_ProjectSourceVersion ]
-then
-  RC_ProjectSourceVersion=1
-fi
-
-EXTRA_FLAGS="-std=c++0x -fstrict-aliasing -Wall -Wextra -Wshadow -Wconversion \
-             -Wnewline-eof -Wpadded -Wmissing-prototypes -Wstrict-aliasing=2 \
-             -Wstrict-overflow=4"
-
-case $TRIPLE in
-  *-apple-*)
-    if [ -z $RC_XBS ]
-    then
-      RC_CFLAGS="-arch i386 -arch x86_64"
-    fi
-    SOEXT=dylib
-	if [ "$MACOSX_DEPLOYMENT_TARGET" == "10.6" ]
-	then
-	    EXTRA_FLAGS="-std=c++0x -U__STRICT_ANSI__"
-		LDSHARED_FLAGS="-o libc++.1.dylib \
-			-dynamiclib -nodefaultlibs -current_version 1 \
-			-compatibility_version 1 \
-			-install_name /usr/lib/libc++.1.dylib \
-			-Wl,-reexport_library,/usr/lib/libc++abi.dylib \
-			-Wl,-unexported_symbols_list,libc++unexp.exp  \
-			/usr/lib/libSystem.B.dylib"
-	else
-		RE_EXPORT_LINE="/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,libc++abi.exp"
-		if [ -n "$SDKROOT" ]
-		then
-			EXTRA_FLAGS+="-isysroot ${SDKROOT}"
-			if echo "${RC_ARCHS}" | grep -q "armv7"  
-			then
-				RE_EXPORT_LINE="${SDKROOT}/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,libc++sjlj-abi.exp"
-			else
-				RE_EXPORT_LINE="-Wl,-reexport_library,${SDKROOT}/usr/lib/libc++abi.dylib"
-			fi
-			CXX=`xcrun -sdk "${SDKROOT}"  -find clang++`
-			CC=`xcrun -sdk "${SDKROOT}"  -find clang`
-		fi
-	    LDSHARED_FLAGS="-o libc++.1.dylib \
-			-dynamiclib -nodefaultlibs  \
-			-current_version ${RC_ProjectSourceVersion} \
-			-compatibility_version 1 \
-			-install_name /usr/lib/libc++.1.dylib \
-			-lSystem  \
-			-Wl,-unexported_symbols_list,libc++unexp.exp  \
-			${RE_EXPORT_LINE}  \
-			-Wl,-force_symbols_not_weak_list,notweak.exp \
-			-Wl,-force_symbols_weak_list,weak.exp"
-	fi
-    ;;
-  *-*-mingw*)
-    # FIXME: removing libgcc and libsupc++ dependencies means porting libcxxrt and LLVM/compiler-rt
-    SOEXT=dll
-    LDSHARED_FLAGS="-o libc++.dll \
-        -shared -nodefaultlibs -Wl,--export-all-symbols -Wl,--allow-multiple-definition -Wl,--out-implib,libc++.dll.a \
-        -lsupc++ -lpthread -lmingw32 -lgcc_s -lgcc -lmoldname -lmingwex -lmsvcr100 -ladvapi32 -lshell32 -luser32 -lkernel32 -lmingw32 -lgcc_s -lgcc -lmoldname -lmingwex -lmsvcrt"
-	;;
-  *)
-    RC_CFLAGS="-fPIC"
-    SOEXT=so
-    LDSHARED_FLAGS="-o libc++.so.1.0 \
-        -shared -nodefaultlibs -Wl,-soname,libc++.so.1 \
-        -lpthread -lrt -lc -lstdc++"
-    ;;
-esac
-
-if [ -z $RC_XBS ]
-then
-    rm -f libc++.1.$SOEXT*
-fi
-
-set -x
-
-for FILE in ../src/*.cpp; do
-	$CXX -c -g -Os $RC_CFLAGS $EXTRA_FLAGS -nostdinc++ -I../include $FILE
-done
-case $TRIPLE in
-  *-*-mingw*)
-  for FILE in ../src/support/win32/*.cpp; do
-    $CXX -c -g -Os $RC_CFLAGS $EXTRA_FLAGS -nostdinc++ -I../include $FILE
-  done
-  ;;
-esac
-$CC *.o $RC_CFLAGS $LDSHARED_FLAGS $EXTRA_FLAGS
-
-#libtool -static -o libc++.a *.o
-
-if [ -z $RC_XBS ]
-then
-    rm *.o
-fi
diff --git a/sources/cxx-stl/llvm-libc++/lib/libc++abi.exp b/sources/cxx-stl/llvm-libc++/lib/libc++abi.exp
deleted file mode 100644
index 87035b2..0000000
--- a/sources/cxx-stl/llvm-libc++/lib/libc++abi.exp
+++ /dev/null
@@ -1,159 +0,0 @@
-___cxa_allocate_exception
-___cxa_end_catch
-___cxa_demangle
-___cxa_current_exception_type
-___cxa_call_unexpected
-___cxa_free_exception
-___cxa_get_exception_ptr
-___cxa_get_globals
-___cxa_get_globals_fast
-___cxa_guard_abort
-___cxa_guard_acquire
-___cxa_guard_release
-___cxa_rethrow
-___cxa_pure_virtual
-___cxa_begin_catch
-___cxa_throw
-___cxa_vec_cctor
-___cxa_vec_cleanup
-___cxa_vec_ctor
-___cxa_vec_delete
-___cxa_vec_delete2
-___cxa_vec_delete3
-___cxa_vec_dtor
-___cxa_vec_new
-___cxa_vec_new2
-___cxa_vec_new3
-___dynamic_cast
-___gxx_personality_v0
-__ZTIDi
-__ZTIDn
-__ZTIDs
-__ZTIPDi
-__ZTIPDn
-__ZTIPDs
-__ZTIPKDi
-__ZTIPKDn
-__ZTIPKDs
-__ZTSPm
-__ZTSPl
-__ZTSPj
-__ZTSPi
-__ZTSPh
-__ZTSPf
-__ZTSPe
-__ZTSPd
-__ZTSPc
-__ZTSPb
-__ZTSPa
-__ZTSPKc
-__ZTSPKy
-__ZTSPKx
-__ZTSPKw
-__ZTSPKv
-__ZTSPKt
-__ZTSPKs
-__ZTSPKm
-__ZTSPKl
-__ZTSPKi
-__ZTSPKh
-__ZTSPs
-__ZTSPt
-__ZTSPv
-__ZTSPw
-__ZTSPKa
-__ZTSPx
-__ZTSPy
-__ZTSPKd
-__ZTSPKe
-__ZTSPKj
-__ZTSPKb
-__ZTSPKf
-__ZTSv
-__ZTSt
-__ZTSs
-__ZTSm
-__ZTSl
-__ZTSj
-__ZTSi
-__ZTSh
-__ZTSf
-__ZTSe
-__ZTSd
-__ZTSc
-__ZTSw
-__ZTSx
-__ZTSy
-__ZTSb
-__ZTSa
-__ZTIPKh
-__ZTIPKf
-__ZTIPKe
-__ZTIPKd
-__ZTIPKc
-__ZTIPKb
-__ZTIPKa
-__ZTIPy
-__ZTIPx
-__ZTIPw
-__ZTIPv
-__ZTIPt
-__ZTIPs
-__ZTIPm
-__ZTIPl
-__ZTIPj
-__ZTIPi
-__ZTIPKi
-__ZTIPKj
-__ZTIPKl
-__ZTIPKm
-__ZTIPKs
-__ZTIPKt
-__ZTIPKv
-__ZTIPKw
-__ZTIPKx
-__ZTIPKy
-__ZTIPa
-__ZTIPb
-__ZTIPc
-__ZTIPd
-__ZTIPe
-__ZTIPf
-__ZTIPh
-__ZTVN10__cxxabiv129__pointer_to_member_type_infoE
-__ZTVN10__cxxabiv116__enum_type_infoE
-__ZTVN10__cxxabiv117__array_type_infoE
-__ZTVN10__cxxabiv117__class_type_infoE
-__ZTVN10__cxxabiv117__pbase_type_infoE
-__ZTVN10__cxxabiv119__pointer_type_infoE
-__ZTVN10__cxxabiv120__function_type_infoE
-__ZTVN10__cxxabiv120__si_class_type_infoE
-__ZTVN10__cxxabiv121__vmi_class_type_infoE
-__ZTVN10__cxxabiv123__fundamental_type_infoE
-__ZTIa
-__ZTIb
-__ZTIc
-__ZTId
-__ZTIe
-__ZTIf
-__ZTIh
-__ZTIi
-__ZTIj
-__ZTIl
-__ZTIm
-__ZTIs
-__ZTIt
-__ZTSN10__cxxabiv129__pointer_to_member_type_infoE
-__ZTSN10__cxxabiv123__fundamental_type_infoE
-__ZTSN10__cxxabiv121__vmi_class_type_infoE
-__ZTSN10__cxxabiv120__si_class_type_infoE
-__ZTSN10__cxxabiv120__function_type_infoE
-__ZTSN10__cxxabiv119__pointer_type_infoE
-__ZTSN10__cxxabiv117__pbase_type_infoE
-__ZTSN10__cxxabiv117__class_type_infoE
-__ZTSN10__cxxabiv117__array_type_infoE
-__ZTSN10__cxxabiv116__enum_type_infoE
-__ZTIy
-__ZTIx
-__ZTIw
-__ZTIv
diff --git a/sources/cxx-stl/llvm-libc++/lib/libc++abi2.exp b/sources/cxx-stl/llvm-libc++/lib/libc++abi2.exp
deleted file mode 100644
index bdfe99c..0000000
--- a/sources/cxx-stl/llvm-libc++/lib/libc++abi2.exp
+++ /dev/null
@@ -1,310 +0,0 @@
-___cxa_allocate_exception
-___cxa_end_catch
-___cxa_demangle
-___cxa_current_exception_type
-___cxa_call_unexpected
-___cxa_free_exception
-___cxa_get_exception_ptr
-___cxa_get_globals
-___cxa_get_globals_fast
-___cxa_guard_abort
-___cxa_guard_acquire
-___cxa_guard_release
-___cxa_rethrow
-___cxa_pure_virtual
-___cxa_begin_catch
-___cxa_throw
-___cxa_vec_cctor
-___cxa_vec_cleanup
-___cxa_vec_ctor
-___cxa_vec_delete
-___cxa_vec_delete2
-___cxa_vec_delete3
-___cxa_vec_dtor
-___cxa_vec_new
-___cxa_vec_new2
-___cxa_vec_new3
-___dynamic_cast
-___gxx_personality_v0
-__ZTIDi
-__ZTIDn
-__ZTIDs
-__ZTIPDi
-__ZTIPDn
-__ZTIPDs
-__ZTIPKDi
-__ZTIPKDn
-__ZTIPKDs
-__ZTSPm
-__ZTSPl
-__ZTSPj
-__ZTSPi
-__ZTSPh
-__ZTSPf
-__ZTSPe
-__ZTSPd
-__ZTSPc
-__ZTSPb
-__ZTSPa
-__ZTSPKc
-__ZTSPKy
-__ZTSPKx
-__ZTSPKw
-__ZTSPKv
-__ZTSPKt
-__ZTSPKs
-__ZTSPKm
-__ZTSPKl
-__ZTSPKi
-__ZTSPKh
-__ZTSPs
-__ZTSPt
-__ZTSPv
-__ZTSPw
-__ZTSPKa
-__ZTSPx
-__ZTSPy
-__ZTSPKd
-__ZTSPKe
-__ZTSPKj
-__ZTSPKb
-__ZTSPKf
-__ZTSv
-__ZTSt
-__ZTSs
-__ZTSm
-__ZTSl
-__ZTSj
-__ZTSi
-__ZTSh
-__ZTSf
-__ZTSe
-__ZTSd
-__ZTSc
-__ZTSw
-__ZTSx
-__ZTSy
-__ZTSb
-__ZTSa
-__ZTIPKh
-__ZTIPKf
-__ZTIPKe
-__ZTIPKd
-__ZTIPKc
-__ZTIPKb
-__ZTIPKa
-__ZTIPy
-__ZTIPx
-__ZTIPw
-__ZTIPv
-__ZTIPt
-__ZTIPs
-__ZTIPm
-__ZTIPl
-__ZTIPj
-__ZTIPi
-__ZTIPKi
-__ZTIPKj
-__ZTIPKl
-__ZTIPKm
-__ZTIPKs
-__ZTIPKt
-__ZTIPKv
-__ZTIPKw
-__ZTIPKx
-__ZTIPKy
-__ZTIPa
-__ZTIPb
-__ZTIPc
-__ZTIPd
-__ZTIPe
-__ZTIPf
-__ZTIPh
-__ZTVN10__cxxabiv129__pointer_to_member_type_infoE
-__ZTVN10__cxxabiv116__enum_type_infoE
-__ZTVN10__cxxabiv117__array_type_infoE
-__ZTVN10__cxxabiv117__class_type_infoE
-__ZTVN10__cxxabiv117__pbase_type_infoE
-__ZTVN10__cxxabiv119__pointer_type_infoE
-__ZTVN10__cxxabiv120__function_type_infoE
-__ZTVN10__cxxabiv120__si_class_type_infoE
-__ZTVN10__cxxabiv121__vmi_class_type_infoE
-__ZTVN10__cxxabiv123__fundamental_type_infoE
-__ZTIa
-__ZTIb
-__ZTIc
-__ZTId
-__ZTIe
-__ZTIf
-__ZTIh
-__ZTIi
-__ZTIj
-__ZTIl
-__ZTIm
-__ZTIs
-__ZTIt
-__ZTSN10__cxxabiv129__pointer_to_member_type_infoE
-__ZTSN10__cxxabiv123__fundamental_type_infoE
-__ZTSN10__cxxabiv121__vmi_class_type_infoE
-__ZTSN10__cxxabiv120__si_class_type_infoE
-__ZTSN10__cxxabiv120__function_type_infoE
-__ZTSN10__cxxabiv119__pointer_type_infoE
-__ZTSN10__cxxabiv117__pbase_type_infoE
-__ZTSN10__cxxabiv117__class_type_infoE
-__ZTSN10__cxxabiv117__array_type_infoE
-__ZTSN10__cxxabiv116__enum_type_infoE
-__ZTIy
-__ZTIx
-__ZTIw
-__ZTIv
-__ZSt13get_terminatev
-__ZSt13set_terminatePFvvE
-__ZSt14get_unexpectedv
-__ZSt14set_unexpectedPFvvE
-__ZSt15get_new_handlerv
-__ZSt15set_new_handlerPFvvE
-__ZSt9terminatev
-__ZNSt9bad_allocD1Ev
-__ZTISt9bad_alloc
-__ZNSt9bad_allocC1Ev
-__ZTISt13bad_exception
-__ZTVSt10bad_typeid
-__ZTVSt9exception
-__ZNSt10bad_typeidC1Ev
-__ZNSt10bad_typeidC1Ev
-__ZNKSt10bad_typeid4whatEv
-__ZNSt10bad_typeidD1Ev
-__ZTVSt8bad_cast
-__ZNSt8bad_castC1Ev
-__ZNSt8bad_castC2Ev
-__ZNSt8bad_castD0Ev
-__ZNKSt8bad_cast4whatEv
-__ZNSt8bad_castD1Ev
-__ZNSt8bad_castD2Ev
-__ZTVSt9bad_alloc
-__ZTVSt20bad_array_new_length
-__ZTVSt13bad_exception
-__ZNKSt9exception4whatEv
-__ZNKSt9bad_alloc4whatEv
-__ZNSt9bad_allocC2Ev
-__ZNSt9bad_allocD0Ev
-__ZNSt9bad_allocD2Ev
-__ZNSt9exceptionD0Ev
-__ZNSt20bad_array_new_lengthC1Ev
-__ZNKSt13bad_exception4whatEv
-__ZNSt9exceptionD1Ev
-__ZNKSt20bad_array_new_length4whatEv
-__ZNSt13bad_exceptionD1Ev
-__ZNSt20bad_array_new_lengthD1Ev
-__ZNSt9exceptionD2Ev
-__ZNSt9type_infoD0Ev
-__ZNSt9type_infoD1Ev
-__ZNSt9type_infoD2Ev
-__ZNSt10bad_typeidC2Ev
-__ZNSt10bad_typeidD0Ev
-__ZNSt10bad_typeidD2Ev
-__ZNSt13bad_exceptionD0Ev
-__ZNSt13bad_exceptionD2Ev
-__ZNSt20bad_array_new_lengthC2Ev
-__ZNSt20bad_array_new_lengthD0Ev
-__ZNSt20bad_array_new_lengthD2Ev
-__ZSt10unexpectedv
-# __ZdaPv
-# __ZdlPv
-# __ZdlPvRKSt9nothrow_t
-# __Znam
-# __ZdaPvRKSt9nothrow_t
-# __Znwm
-# __ZnwmRKSt9nothrow_t
-# __ZnamRKSt9nothrow_t
-__ZTISt10bad_typeid
-__ZTISt8bad_cast
-___cxa_bad_typeid
-___cxa_bad_cast
-__ZTISt9exception
-__ZTISt9type_info
-__ZTISt20bad_array_new_length
-
-__ZNKSt11logic_error4whatEv
-__ZNSt11logic_errorD0Ev
-__ZNSt11logic_errorD1Ev
-__ZNSt11logic_errorD2Ev
-__ZTISt11logic_error
-__ZTSSt11logic_error
-__ZTVSt11logic_error
-
-__ZNKSt13runtime_error4whatEv
-__ZNSt13runtime_errorD0Ev
-__ZNSt13runtime_errorD1Ev
-__ZNSt13runtime_errorD2Ev
-__ZTISt13runtime_error
-__ZTSSt13runtime_error
-__ZTVSt13runtime_error
-
-__ZNSt11range_errorD0Ev
-__ZNSt11range_errorD1Ev
-__ZNSt11range_errorD2Ev
-__ZTISt11range_error
-__ZTSSt11range_error
-__ZTVSt11range_error
-
-__ZNSt12domain_errorD0Ev
-__ZNSt12domain_errorD1Ev
-__ZNSt12domain_errorD2Ev
-__ZTISt12domain_error
-__ZTSSt12domain_error
-__ZTVSt12domain_error
-
-__ZNSt12length_errorD0Ev
-__ZNSt12length_errorD1Ev
-__ZNSt12length_errorD2Ev
-__ZTISt12length_error
-__ZTSSt12length_error
-__ZTVSt12length_error
-
-__ZNSt12out_of_rangeD0Ev
-__ZNSt12out_of_rangeD1Ev
-__ZNSt12out_of_rangeD2Ev
-__ZTISt12out_of_range
-__ZTSSt12out_of_range
-__ZTVSt12out_of_range
-
-__ZNSt14overflow_errorD0Ev
-__ZNSt14overflow_errorD1Ev
-__ZNSt14overflow_errorD2Ev
-__ZTISt14overflow_error
-__ZTSSt14overflow_error
-__ZTVSt14overflow_error
-
-__ZNSt15underflow_errorD0Ev
-__ZNSt15underflow_errorD1Ev
-__ZNSt15underflow_errorD2Ev
-__ZTISt15underflow_error
-__ZTSSt15underflow_error
-__ZTVSt15underflow_error
-
-__ZNSt16invalid_argumentD0Ev
-__ZNSt16invalid_argumentD1Ev
-__ZNSt16invalid_argumentD2Ev
-__ZTISt16invalid_argument
-__ZTSSt16invalid_argument
-__ZTVSt16invalid_argument
-
-__ZTSDi
-__ZTSDn
-__ZTSDs
-__ZTSPDi
-__ZTSPDn
-__ZTSPDs
-__ZTSPKDi
-__ZTSPKDn
-__ZTSPKDs
-
-__ZTSSt8bad_cast
-__ZTSSt9bad_alloc
-__ZTSSt9exception
-__ZTSSt9type_info
-__ZTSSt10bad_typeid
-__ZTSSt13bad_exception
-__ZTSSt20bad_array_new_length
-__ZTVSt9type_info
diff --git a/sources/cxx-stl/llvm-libc++/lib/libc++sjlj-abi.exp b/sources/cxx-stl/llvm-libc++/lib/libc++sjlj-abi.exp
deleted file mode 100644
index e646df1..0000000
--- a/sources/cxx-stl/llvm-libc++/lib/libc++sjlj-abi.exp
+++ /dev/null
@@ -1,159 +0,0 @@
-___cxa_allocate_exception
-___cxa_end_catch
-___cxa_demangle
-___cxa_current_exception_type
-___cxa_call_unexpected
-___cxa_free_exception
-___cxa_get_exception_ptr
-___cxa_get_globals
-___cxa_get_globals_fast
-___cxa_guard_abort
-___cxa_guard_acquire
-___cxa_guard_release
-___cxa_rethrow
-___cxa_pure_virtual
-___cxa_begin_catch
-___cxa_throw
-___cxa_vec_cctor
-___cxa_vec_cleanup
-___cxa_vec_ctor
-___cxa_vec_delete
-___cxa_vec_delete2
-___cxa_vec_delete3
-___cxa_vec_dtor
-___cxa_vec_new
-___cxa_vec_new2
-___cxa_vec_new3
-___dynamic_cast
-___gxx_personality_sj0
-__ZTIDi
-__ZTIDn
-__ZTIDs
-__ZTIPDi
-__ZTIPDn
-__ZTIPDs
-__ZTIPKDi
-__ZTIPKDn
-__ZTIPKDs
-__ZTSPm
-__ZTSPl
-__ZTSPj
-__ZTSPi
-__ZTSPh
-__ZTSPf
-__ZTSPe
-__ZTSPd
-__ZTSPc
-__ZTSPb
-__ZTSPa
-__ZTSPKc
-__ZTSPKy
-__ZTSPKx
-__ZTSPKw
-__ZTSPKv
-__ZTSPKt
-__ZTSPKs
-__ZTSPKm
-__ZTSPKl
-__ZTSPKi
-__ZTSPKh
-__ZTSPs
-__ZTSPt
-__ZTSPv
-__ZTSPw
-__ZTSPKa
-__ZTSPx
-__ZTSPy
-__ZTSPKd
-__ZTSPKe
-__ZTSPKj
-__ZTSPKb
-__ZTSPKf
-__ZTSv
-__ZTSt
-__ZTSs
-__ZTSm
-__ZTSl
-__ZTSj
-__ZTSi
-__ZTSh
-__ZTSf
-__ZTSe
-__ZTSd
-__ZTSc
-__ZTSw
-__ZTSx
-__ZTSy
-__ZTSb
-__ZTSa
-__ZTIPKh
-__ZTIPKf
-__ZTIPKe
-__ZTIPKd
-__ZTIPKc
-__ZTIPKb
-__ZTIPKa
-__ZTIPy
-__ZTIPx
-__ZTIPw
-__ZTIPv
-__ZTIPt
-__ZTIPs
-__ZTIPm
-__ZTIPl
-__ZTIPj
-__ZTIPi
-__ZTIPKi
-__ZTIPKj
-__ZTIPKl
-__ZTIPKm
-__ZTIPKs
-__ZTIPKt
-__ZTIPKv
-__ZTIPKw
-__ZTIPKx
-__ZTIPKy
-__ZTIPa
-__ZTIPb
-__ZTIPc
-__ZTIPd
-__ZTIPe
-__ZTIPf
-__ZTIPh
-__ZTVN10__cxxabiv129__pointer_to_member_type_infoE
-__ZTVN10__cxxabiv116__enum_type_infoE
-__ZTVN10__cxxabiv117__array_type_infoE
-__ZTVN10__cxxabiv117__class_type_infoE
-__ZTVN10__cxxabiv117__pbase_type_infoE
-__ZTVN10__cxxabiv119__pointer_type_infoE
-__ZTVN10__cxxabiv120__function_type_infoE
-__ZTVN10__cxxabiv120__si_class_type_infoE
-__ZTVN10__cxxabiv121__vmi_class_type_infoE
-__ZTVN10__cxxabiv123__fundamental_type_infoE
-__ZTIa
-__ZTIb
-__ZTIc
-__ZTId
-__ZTIe
-__ZTIf
-__ZTIh
-__ZTIi
-__ZTIj
-__ZTIl
-__ZTIm
-__ZTIs
-__ZTIt
-__ZTSN10__cxxabiv129__pointer_to_member_type_infoE
-__ZTSN10__cxxabiv123__fundamental_type_infoE
-__ZTSN10__cxxabiv121__vmi_class_type_infoE
-__ZTSN10__cxxabiv120__si_class_type_infoE
-__ZTSN10__cxxabiv120__function_type_infoE
-__ZTSN10__cxxabiv119__pointer_type_infoE
-__ZTSN10__cxxabiv117__pbase_type_infoE
-__ZTSN10__cxxabiv117__class_type_infoE
-__ZTSN10__cxxabiv117__array_type_infoE
-__ZTSN10__cxxabiv116__enum_type_infoE
-__ZTIy
-__ZTIx
-__ZTIw
-__ZTIv
diff --git a/sources/cxx-stl/llvm-libc++/lib/libc++unexp.exp b/sources/cxx-stl/llvm-libc++/lib/libc++unexp.exp
deleted file mode 100644
index 9507fc5..0000000
--- a/sources/cxx-stl/llvm-libc++/lib/libc++unexp.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-# all guard variables
-__ZGVNSt3__*
-# all vtables
-# __ZTV*
-# all VTT
-# __ZTT*
-# all non-virtual thunks
-# __ZTh*
-# all virtual thunks
-# __ZTv*
-# typeinfo for std::__1::__types
-#    There are no std::__types
-# __ZTINSt3__1[0-9][0-9]*__*
-# typeinfo name for std::__1::__types
-__ZTSNSt3__1[0-9][0-9]*__*
-# anything using __hidden_allocator
-*__hidden_allocator*
-# anything using __sso_allocator
-*__sso_allocator*
diff --git a/sources/cxx-stl/llvm-libc++/lib/notweak.exp b/sources/cxx-stl/llvm-libc++/lib/notweak.exp
deleted file mode 100644
index fafde1c..0000000
--- a/sources/cxx-stl/llvm-libc++/lib/notweak.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-# Remove the weak-def bit from these external symbols
-__ZT*
-__ZN*
-__ZS*
-
diff --git a/sources/cxx-stl/llvm-libc++/lib/weak.exp b/sources/cxx-stl/llvm-libc++/lib/weak.exp
deleted file mode 100644
index 6bdcc05..0000000
--- a/sources/cxx-stl/llvm-libc++/lib/weak.exp
+++ /dev/null
@@ -1,16 +0,0 @@
-__ZTISt10bad_typeid
-__ZTISt11logic_error
-__ZTISt11range_error
-__ZTISt12domain_error
-__ZTISt12length_error
-__ZTISt12out_of_range
-__ZTISt13bad_exception
-__ZTISt13runtime_error
-__ZTISt14overflow_error
-__ZTISt15underflow_error
-__ZTISt16invalid_argument
-__ZTISt16nested_exception
-__ZTISt20bad_array_new_length
-__ZTISt8bad_cast
-__ZTISt9bad_alloc
-__ZTISt9exception
diff --git a/sources/cxx-stl/llvm-libc++/CREDITS.TXT b/sources/cxx-stl/llvm-libc++/libcxx/CREDITS.TXT
similarity index 90%
rename from sources/cxx-stl/llvm-libc++/CREDITS.TXT
rename to sources/cxx-stl/llvm-libc++/libcxx/CREDITS.TXT
index 544138d..61b3542 100644
--- a/sources/cxx-stl/llvm-libc++/CREDITS.TXT
+++ b/sources/cxx-stl/llvm-libc++/libcxx/CREDITS.TXT
@@ -74,6 +74,13 @@
 N: Richard Smith
 D: Minor patches.
 
+N: Joerg Sonnenberger
+E: joerg@NetBSD.org
+D: NetBSD port.
+
+N: Michael van der Westhuizen
+E: r1mikey at gmail dot com
+
 N: Klaas de Vries
 E: klaas at klaasgaaf dot nl
 D: Minor bug fix.
@@ -86,3 +93,7 @@
 E: jyasskin@gmail.com
 E: jyasskin@google.com
 D: Linux fixes.
+
+N: Bruce Mitchener, Jr.
+E: bruce.mitchener@gmail.com
+D: Emscripten-related changes.
diff --git a/sources/cxx-stl/llvm-libc++/LICENSE.TXT b/sources/cxx-stl/llvm-libc++/libcxx/LICENSE.TXT
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/LICENSE.TXT
rename to sources/cxx-stl/llvm-libc++/libcxx/LICENSE.TXT
diff --git a/sources/cxx-stl/llvm-libc++/include/__bit_reference b/sources/cxx-stl/llvm-libc++/libcxx/include/__bit_reference
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/include/__bit_reference
rename to sources/cxx-stl/llvm-libc++/libcxx/include/__bit_reference
index 8180295..1621deb 100644
--- a/sources/cxx-stl/llvm-libc++/include/__bit_reference
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/__bit_reference
@@ -81,6 +81,16 @@
 {
 };
 
+template <class _Cp>
+_LIBCPP_INLINE_VISIBILITY inline
+void
+swap(__bit_reference<_Cp> __x, __bit_reference<_Cp> __y) _NOEXCEPT
+{
+    bool __t = __x;
+    __x = __y;
+    __y = __t;
+}
+
 template <class _Cp, class _Dp>
 _LIBCPP_INLINE_VISIBILITY inline
 void
diff --git a/sources/cxx-stl/llvm-libc++/include/__config b/sources/cxx-stl/llvm-libc++/libcxx/include/__config
similarity index 88%
rename from sources/cxx-stl/llvm-libc++/include/__config
rename to sources/cxx-stl/llvm-libc++/libcxx/include/__config
index 9ad939d..9463008 100644
--- a/sources/cxx-stl/llvm-libc++/include/__config
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/__config
@@ -11,7 +11,7 @@
 #ifndef _LIBCPP_CONFIG
 #define _LIBCPP_CONFIG
 
-#if !_MSC_VER // explicit macro necessary because it is only defined below in this file
+#ifndef _MSC_VER // explicit macro necessary because it is only defined below in this file
 #pragma GCC system_header
 #endif
 
@@ -96,24 +96,27 @@
 # endif
 #endif  // !defined(_LIBCPP_LITTLE_ENDIAN) || !defined(_LIBCPP_BIG_ENDIAN)
 
-#if _WIN32
+#ifdef _WIN32
 
 // only really useful for a DLL
 #ifdef _LIBCPP_DLL // this should be a compiler builtin define ideally...
 # ifdef cxx_EXPORTS
 #  define _LIBCPP_HIDDEN
-#  define _LIBCPP_VISIBLE __declspec(dllexport)
+#  define _LIBCPP_FUNC_VIS __declspec(dllexport)
+#  define _LIBCPP_TYPE_VIS __declspec(dllexport)
 # else
 #  define _LIBCPP_HIDDEN
-#  define _LIBCPP_VISIBLE __declspec(dllimport)
+#  define _LIBCPP_FUNC_VIS __declspec(dllimport)
+#  define _LIBCPP_TYPE_VIS __declspec(dllimport)
 # endif
 #else
 # define _LIBCPP_HIDDEN
-# define _LIBCPP_VISIBLE
+# define _LIBCPP_FUNC_VIS
+# define _LIBCPP_TYPE_VIS
 #endif
 
 #ifndef _LIBCPP_INLINE_VISIBILITY
-# if _MSC_VER
+# ifdef _MSC_VER
 #  define _LIBCPP_INLINE_VISIBILITY __forceinline
 # else // MinGW GCC and Clang
 #  define _LIBCPP_INLINE_VISIBILITY __attribute__ ((__always_inline__))
@@ -121,23 +124,35 @@
 #endif
 
 #ifndef _LIBCPP_EXCEPTION_ABI
-#define _LIBCPP_EXCEPTION_ABI _LIBCPP_VISIBLE
+#define _LIBCPP_EXCEPTION_ABI _LIBCPP_TYPE_VIS
 #endif
 
 #ifndef _LIBCPP_ALWAYS_INLINE
-# if _MSC_VER
+# ifdef _MSC_VER
 #  define _LIBCPP_ALWAYS_INLINE __forceinline
 # endif
 #endif
 
 #endif // _WIN32
 
+#ifndef __has_attribute
+#define __has_attribute(__x) 0
+#endif
+
 #ifndef _LIBCPP_HIDDEN
 #define _LIBCPP_HIDDEN __attribute__ ((__visibility__("hidden")))
 #endif
 
-#ifndef _LIBCPP_VISIBLE
-#define _LIBCPP_VISIBLE __attribute__ ((__visibility__("default")))
+#ifndef _LIBCPP_FUNC_VIS
+#define _LIBCPP_FUNC_VIS __attribute__ ((__visibility__("default")))
+#endif
+
+#ifndef _LIBCPP_TYPE_VIS
+#  if __has_attribute(type_visibility)
+#    define _LIBCPP_TYPE_VIS __attribute__ ((__type_visibility__("default")))
+#  else
+#    define _LIBCPP_TYPE_VIS __attribute__ ((__visibility__("default")))
+#  endif
 #endif
 
 #ifndef _LIBCPP_INLINE_VISIBILITY
@@ -145,7 +160,7 @@
 #endif
 
 #ifndef _LIBCPP_EXCEPTION_ABI
-#define _LIBCPP_EXCEPTION_ABI __attribute__ ((__visibility__("default")))
+#define _LIBCPP_EXCEPTION_ABI _LIBCPP_TYPE_VIS
 #endif
 
 #ifndef _LIBCPP_CANTTHROW
@@ -261,7 +276,7 @@
 #define _LIBCPP_HAS_NO_CONSTEXPR
 #endif
 
-#if __FreeBSD__ && (__ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L)
+#if defined(__FreeBSD__) && (__ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L)
 #define _LIBCPP_HAS_QUICK_EXIT
 #define _LIBCPP_HAS_C11_FEATURES
 #endif
@@ -416,7 +431,7 @@
 #endif
 
 #ifdef __GNUC__
-#define _NOALIAS __attribute__((malloc))
+#define _NOALIAS __attribute__((__malloc__))
 #else
 #define _NOALIAS
 #endif
@@ -432,7 +447,7 @@
 #endif
 
 #ifdef _LIBCPP_HAS_NO_STRONG_ENUMS
-#define _LIBCPP_DECLARE_STRONG_ENUM(x) struct _LIBCPP_VISIBLE x { enum __lx
+#define _LIBCPP_DECLARE_STRONG_ENUM(x) struct _LIBCPP_TYPE_VIS x { enum __lx
 #define _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(x) \
     __lx __v_; \
     _LIBCPP_ALWAYS_INLINE x(__lx __v) : __v_(__v) {} \
@@ -440,7 +455,7 @@
     _LIBCPP_ALWAYS_INLINE operator int() const {return __v_;} \
     };
 #else  // _LIBCPP_HAS_NO_STRONG_ENUMS
-#define _LIBCPP_DECLARE_STRONG_ENUM(x) enum class _LIBCPP_VISIBLE x
+#define _LIBCPP_DECLARE_STRONG_ENUM(x) enum class _LIBCPP_TYPE_VIS x
 #define _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(x)
 #endif  // _LIBCPP_HAS_NO_STRONG_ENUMS
 
@@ -448,18 +463,18 @@
 #define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__;
 #endif
 
-#if __APPLE__ || __FreeBSD__ || _WIN32 || __sun__
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__)
 #define _LIBCPP_LOCALE__L_EXTENSIONS 1
 #endif
-#if __FreeBSD__
+#ifdef __FreeBSD__
 #define _DECLARE_C99_LDBL_MATH 1
 #endif
 
-#if __APPLE__ || __FreeBSD__
+#if defined(__APPLE__) || defined(__FreeBSD__)
 #define _LIBCPP_HAS_DEFAULTRUNELOCALE
 #endif
 
-#if __APPLE__ || __FreeBSD__ || __sun__
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun__)
 #define _LIBCPP_WCTYPE_IS_MASK
 #endif
 
diff --git a/sources/cxx-stl/llvm-libc++/include/__debug b/sources/cxx-stl/llvm-libc++/libcxx/include/__debug
similarity index 91%
rename from sources/cxx-stl/llvm-libc++/include/__debug
rename to sources/cxx-stl/llvm-libc++/libcxx/include/__debug
index 4a0e3ce..0d631bf 100644
--- a/sources/cxx-stl/llvm-libc++/include/__debug
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/__debug
@@ -16,7 +16,9 @@
 #   include <cstdlib>
 #   include <cstdio>
 #   include <cstddef>
-#   define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : (_VSTD::printf("%s\n", m), _VSTD::abort()))
+#   ifndef _LIBCPP_ASSERT
+#      define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : (_VSTD::printf("%s\n", m), _VSTD::abort()))
+#   endif
 
 #endif
 
@@ -24,9 +26,9 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-struct _LIBCPP_VISIBLE __c_node;
+struct _LIBCPP_TYPE_VIS __c_node;
 
-struct _LIBCPP_VISIBLE __i_node
+struct _LIBCPP_TYPE_VIS __i_node
 {
     void* __i_;
     __i_node* __next_;
@@ -40,7 +42,7 @@
     ~__i_node();
 };
 
-struct _LIBCPP_VISIBLE __c_node
+struct _LIBCPP_TYPE_VIS __c_node
 {
     void* __c_;
     __c_node* __next_;
@@ -117,7 +119,7 @@
     return _Cp->__subscriptable(__j, __n);
 }
 
-class _LIBCPP_VISIBLE __libcpp_db
+class _LIBCPP_TYPE_VIS __libcpp_db
 {
     __c_node** __cbeg_;
     __c_node** __cend_;
@@ -176,11 +178,11 @@
     _LIBCPP_HIDDEN
     __i_node* __find_iterator(const void* __i) const;
 
-    friend _LIBCPP_VISIBLE __libcpp_db* __get_db();
+    friend _LIBCPP_FUNC_VIS __libcpp_db* __get_db();
 };
 
-_LIBCPP_VISIBLE __libcpp_db* __get_db();
-_LIBCPP_VISIBLE const __libcpp_db* __get_const_db();
+_LIBCPP_FUNC_VIS __libcpp_db* __get_db();
+_LIBCPP_FUNC_VIS const __libcpp_db* __get_const_db();
 
 
 _LIBCPP_END_NAMESPACE_STD
diff --git a/sources/cxx-stl/llvm-libc++/include/__functional_03 b/sources/cxx-stl/llvm-libc++/libcxx/include/__functional_03
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/include/__functional_03
rename to sources/cxx-stl/llvm-libc++/libcxx/include/__functional_03
index 3a5397d..b52d692 100644
--- a/sources/cxx-stl/llvm-libc++/include/__functional_03
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/__functional_03
@@ -203,7 +203,7 @@
 {
 };
 
-template<class _Fp> class _LIBCPP_VISIBLE function; // undefined
+template<class _Fp> class _LIBCPP_TYPE_VIS function; // undefined
 
 namespace __function
 {
@@ -644,7 +644,7 @@
 }  // __function
 
 template<class _Rp>
-class _LIBCPP_VISIBLE function<_Rp()>
+class _LIBCPP_TYPE_VIS function<_Rp()>
 {
     typedef __function::__base<_Rp()> __base;
     aligned_storage<3*sizeof(void*)>::type __buf_;
@@ -928,7 +928,7 @@
 #endif  // _LIBCPP_NO_RTTI
 
 template<class _Rp, class _A0>
-class _LIBCPP_VISIBLE function<_Rp(_A0)>
+class _LIBCPP_TYPE_VIS function<_Rp(_A0)>
     : public unary_function<_A0, _Rp>
 {
     typedef __function::__base<_Rp(_A0)> __base;
@@ -1230,7 +1230,7 @@
 #endif  // _LIBCPP_NO_RTTI
 
 template<class _Rp, class _A0, class _A1>
-class _LIBCPP_VISIBLE function<_Rp(_A0, _A1)>
+class _LIBCPP_TYPE_VIS function<_Rp(_A0, _A1)>
     : public binary_function<_A0, _A1, _Rp>
 {
     typedef __function::__base<_Rp(_A0, _A1)> __base;
@@ -1532,7 +1532,7 @@
 #endif  // _LIBCPP_NO_RTTI
 
 template<class _Rp, class _A0, class _A1, class _A2>
-class _LIBCPP_VISIBLE function<_Rp(_A0, _A1, _A2)>
+class _LIBCPP_TYPE_VIS function<_Rp(_A0, _A1, _A2)>
 {
     typedef __function::__base<_Rp(_A0, _A1, _A2)> __base;
     aligned_storage<3*sizeof(void*)>::type __buf_;
@@ -1860,11 +1860,11 @@
 {return __x.swap(__y);}
 
 template<class _Tp> struct __is_bind_expression : public false_type {};
-template<class _Tp> struct _LIBCPP_VISIBLE is_bind_expression
+template<class _Tp> struct _LIBCPP_TYPE_VIS is_bind_expression
     : public __is_bind_expression<typename remove_cv<_Tp>::type> {};
 
 template<class _Tp> struct __is_placeholder : public integral_constant<int, 0> {};
-template<class _Tp> struct _LIBCPP_VISIBLE is_placeholder
+template<class _Tp> struct _LIBCPP_TYPE_VIS is_placeholder
     : public __is_placeholder<typename remove_cv<_Tp>::type> {};
 
 namespace placeholders
diff --git a/sources/cxx-stl/llvm-libc++/include/__functional_base b/sources/cxx-stl/llvm-libc++/libcxx/include/__functional_base
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/include/__functional_base
rename to sources/cxx-stl/llvm-libc++/libcxx/include/__functional_base
index 2385459..40a63a8 100644
--- a/sources/cxx-stl/llvm-libc++/include/__functional_base
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/__functional_base
@@ -23,21 +23,21 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 template <class _Arg, class _Result>
-struct _LIBCPP_VISIBLE unary_function
+struct _LIBCPP_TYPE_VIS unary_function
 {
     typedef _Arg    argument_type;
     typedef _Result result_type;
 };
 
 template <class _Arg1, class _Arg2, class _Result>
-struct _LIBCPP_VISIBLE binary_function
+struct _LIBCPP_TYPE_VIS binary_function
 {
     typedef _Arg1   first_argument_type;
     typedef _Arg2   second_argument_type;
     typedef _Result result_type;
 };
 
-template <class _Tp> struct _LIBCPP_VISIBLE hash;
+template <class _Tp> struct _LIBCPP_TYPE_VIS hash;
 
 template <class _Tp>
 struct __has_result_type
@@ -51,7 +51,7 @@
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE less : binary_function<_Tp, _Tp, bool>
+struct _LIBCPP_TYPE_VIS less : binary_function<_Tp, _Tp, bool>
 {
     _LIBCPP_INLINE_VISIBILITY bool operator()(const _Tp& __x, const _Tp& __y) const
         {return __x < __y;}
@@ -348,7 +348,7 @@
 };
 
 template <class _Tp>
-class _LIBCPP_VISIBLE reference_wrapper
+class _LIBCPP_TYPE_VIS reference_wrapper
     : public __weak_result_type<_Tp>
 {
 public:
diff --git a/sources/cxx-stl/llvm-libc++/include/__functional_base_03 b/sources/cxx-stl/llvm-libc++/libcxx/include/__functional_base_03
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/include/__functional_base_03
rename to sources/cxx-stl/llvm-libc++/libcxx/include/__functional_base_03
index a1005bf..11165a9 100644
--- a/sources/cxx-stl/llvm-libc++/include/__functional_base_03
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/__functional_base_03
@@ -996,7 +996,7 @@
 };
 
 template <class _Tp>
-class _LIBCPP_VISIBLE reference_wrapper
+class _LIBCPP_TYPE_VIS reference_wrapper
     : public __weak_result_type<_Tp>
 {
 public:
diff --git a/sources/cxx-stl/llvm-libc++/include/__hash_table b/sources/cxx-stl/llvm-libc++/libcxx/include/__hash_table
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/__hash_table
rename to sources/cxx-stl/llvm-libc++/libcxx/include/__hash_table
index ba04b3e..6f6050d 100644
--- a/sources/cxx-stl/llvm-libc++/include/__hash_table
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/__hash_table
@@ -26,7 +26,7 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-_LIBCPP_VISIBLE
+_LIBCPP_FUNC_VIS
 size_t __next_prime(size_t __n);
 
 template <class _NodePtr>
@@ -80,14 +80,14 @@
 }
 
 template <class _Tp, class _Hash, class _Equal, class _Alloc> class __hash_table;
-template <class _ConstNodePtr> class _LIBCPP_VISIBLE __hash_const_iterator;
-template <class _HashIterator> class _LIBCPP_VISIBLE __hash_map_iterator;
-template <class _HashIterator> class _LIBCPP_VISIBLE __hash_map_const_iterator;
+template <class _ConstNodePtr> class _LIBCPP_TYPE_VIS __hash_const_iterator;
+template <class _HashIterator> class _LIBCPP_TYPE_VIS __hash_map_iterator;
+template <class _HashIterator> class _LIBCPP_TYPE_VIS __hash_map_const_iterator;
 template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-    class _LIBCPP_VISIBLE unordered_map;
+    class _LIBCPP_TYPE_VIS unordered_map;
 
 template <class _NodePtr>
-class _LIBCPP_VISIBLE __hash_iterator
+class _LIBCPP_TYPE_VIS __hash_iterator
 {
     typedef _NodePtr __node_pointer;
 
@@ -142,14 +142,14 @@
         {}
 
     template <class, class, class, class> friend class __hash_table;
-    template <class> friend class _LIBCPP_VISIBLE __hash_const_iterator;
-    template <class> friend class _LIBCPP_VISIBLE __hash_map_iterator;
-    template <class, class, class, class, class> friend class _LIBCPP_VISIBLE unordered_map;
-    template <class, class, class, class, class> friend class _LIBCPP_VISIBLE unordered_multimap;
+    template <class> friend class _LIBCPP_TYPE_VIS __hash_const_iterator;
+    template <class> friend class _LIBCPP_TYPE_VIS __hash_map_iterator;
+    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS unordered_map;
+    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS unordered_multimap;
 };
 
 template <class _ConstNodePtr>
-class _LIBCPP_VISIBLE __hash_const_iterator
+class _LIBCPP_TYPE_VIS __hash_const_iterator
 {
     typedef _ConstNodePtr __node_pointer;
 
@@ -220,15 +220,15 @@
         {}
 
     template <class, class, class, class> friend class __hash_table;
-    template <class> friend class _LIBCPP_VISIBLE __hash_map_const_iterator;
-    template <class, class, class, class, class> friend class _LIBCPP_VISIBLE unordered_map;
-    template <class, class, class, class, class> friend class _LIBCPP_VISIBLE unordered_multimap;
+    template <class> friend class _LIBCPP_TYPE_VIS __hash_map_const_iterator;
+    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS unordered_map;
+    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS unordered_multimap;
 };
 
-template <class _ConstNodePtr> class _LIBCPP_VISIBLE __hash_const_local_iterator;
+template <class _ConstNodePtr> class _LIBCPP_TYPE_VIS __hash_const_local_iterator;
 
 template <class _NodePtr>
-class _LIBCPP_VISIBLE __hash_local_iterator
+class _LIBCPP_TYPE_VIS __hash_local_iterator
 {
     typedef _NodePtr __node_pointer;
 
@@ -294,12 +294,12 @@
         }
 
     template <class, class, class, class> friend class __hash_table;
-    template <class> friend class _LIBCPP_VISIBLE __hash_const_local_iterator;
-    template <class> friend class _LIBCPP_VISIBLE __hash_map_iterator;
+    template <class> friend class _LIBCPP_TYPE_VIS __hash_const_local_iterator;
+    template <class> friend class _LIBCPP_TYPE_VIS __hash_map_iterator;
 };
 
 template <class _ConstNodePtr>
-class _LIBCPP_VISIBLE __hash_const_local_iterator
+class _LIBCPP_TYPE_VIS __hash_const_local_iterator
 {
     typedef _ConstNodePtr __node_pointer;
 
@@ -384,7 +384,7 @@
         }
 
     template <class, class, class, class> friend class __hash_table;
-    template <class> friend class _LIBCPP_VISIBLE __hash_map_const_iterator;
+    template <class> friend class _LIBCPP_TYPE_VIS __hash_map_const_iterator;
 };
 
 template <class _Alloc>
diff --git a/sources/cxx-stl/llvm-libc++/include/__locale b/sources/cxx-stl/llvm-libc++/libcxx/include/__locale
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/include/__locale
rename to sources/cxx-stl/llvm-libc++/libcxx/include/__locale
index 64e350b..8c93b71 100644
--- a/sources/cxx-stl/llvm-libc++/include/__locale
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/__locale
@@ -19,11 +19,11 @@
 #include <cstdint>
 #include <cctype>
 #include <locale.h>
-#if _WIN32
+#ifdef _WIN32
 # include <support/win32/locale_win32.h>
-#elif (__GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__)
+#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun__)) || defined(EMSCRIPTEN)
 # include <xlocale.h>
-#endif  // _WIN32 || __GLIBC__ || __APPLE__ || __FreeBSD_
+#endif  // _WIN32 || __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || EMSCRIPTEN
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
@@ -31,7 +31,7 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-class _LIBCPP_VISIBLE locale;
+class _LIBCPP_TYPE_VIS locale;
 
 template <class _Facet>
 _LIBCPP_INLINE_VISIBILITY
@@ -43,12 +43,12 @@
 const _Facet&
 use_facet(const locale&);
 
-class _LIBCPP_VISIBLE locale
+class _LIBCPP_TYPE_VIS locale
 {
 public:
     // types:
-    class _LIBCPP_VISIBLE facet;
-    class _LIBCPP_VISIBLE id;
+    class _LIBCPP_TYPE_VIS facet;
+    class _LIBCPP_TYPE_VIS id;
 
     typedef int category;
     static const category // values assigned here are for exposition only
@@ -103,7 +103,7 @@
     template <class _Facet> friend const _Facet& use_facet(const locale&);
 };
 
-class _LIBCPP_VISIBLE locale::facet
+class _LIBCPP_TYPE_VIS locale::facet
     : public __shared_count
 {
 protected:
@@ -119,7 +119,7 @@
     virtual void __on_zero_shared() _NOEXCEPT;
 };
 
-class _LIBCPP_VISIBLE locale::id
+class _LIBCPP_TYPE_VIS locale::id
 {
     once_flag      __flag_;
     int32_t        __id_;
@@ -175,7 +175,7 @@
 // template <class _CharT> class collate;
 
 template <class _CharT>
-class _LIBCPP_VISIBLE collate
+class _LIBCPP_TYPE_VIS collate
     : public locale::facet
 {
 public:
@@ -254,15 +254,15 @@
     return static_cast<long>(__h);
 }
 
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_VISIBLE collate<char>)
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_VISIBLE collate<wchar_t>)
+_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS collate<char>)
+_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS collate<wchar_t>)
 
 // template <class CharT> class collate_byname;
 
-template <class _CharT> class _LIBCPP_VISIBLE collate_byname;
+template <class _CharT> class _LIBCPP_TYPE_VIS collate_byname;
 
 template <>
-class _LIBCPP_VISIBLE collate_byname<char>
+class _LIBCPP_TYPE_VIS collate_byname<char>
     : public collate<char>
 {
     locale_t __l;
@@ -281,7 +281,7 @@
 };
 
 template <>
-class _LIBCPP_VISIBLE collate_byname<wchar_t>
+class _LIBCPP_TYPE_VIS collate_byname<wchar_t>
     : public collate<wchar_t>
 {
     locale_t __l;
@@ -312,10 +312,10 @@
 
 // template <class charT> class ctype
 
-class _LIBCPP_VISIBLE ctype_base
+class _LIBCPP_TYPE_VIS ctype_base
 {
 public:
-#if __GLIBC__
+#ifdef __GLIBC__
     typedef unsigned short mask;
     static const mask space  = _ISspace;
     static const mask print  = _ISprint;
@@ -327,7 +327,7 @@
     static const mask punct  = _ISpunct;
     static const mask xdigit = _ISxdigit;
     static const mask blank  = _ISblank;
-#elif _WIN32
+#elif defined(_WIN32)
     typedef unsigned short mask;
     static const mask space  = _SPACE;
     static const mask print  = _BLANK|_PUNCT|_ALPHA|_DIGIT;
@@ -339,11 +339,13 @@
     static const mask punct  = _PUNCT;
     static const mask xdigit = _HEX;
     static const mask blank  = _BLANK;
-#elif (__APPLE__ || __FreeBSD__)
-#if __APPLE__
+#elif (defined(__APPLE__) || defined(__FreeBSD__)) || defined(EMSCRIPTEN)
+#ifdef __APPLE__
     typedef __uint32_t mask;
-#elif __FreeBSD__
+#elif defined(__FreeBSD__)
     typedef unsigned long mask;
+#elif defined(EMSCRIPTEN)
+    typedef unsigned short mask;
 #endif
     static const mask space  = _CTYPE_S;
     static const mask print  = _CTYPE_R;
@@ -355,7 +357,7 @@
     static const mask punct  = _CTYPE_P;
     static const mask xdigit = _CTYPE_X;
     static const mask blank  = _CTYPE_B;
-#elif __sun__
+#elif defined(__sun__)
     typedef unsigned int mask;
     static const mask space  = _ISSPACE;
     static const mask print  = _ISPRINT;
@@ -367,7 +369,7 @@
     static const mask punct  = _ISPUNCT;
     static const mask xdigit = _ISXDIGIT;
     static const mask blank  = _ISBLANK;
-#elif __ANDROID__
+#elif defined(__ANDROID__)
     typedef char mask;
     static const mask space  = _S;
     static const mask print  = _P | _U | _L | _N | _B;
@@ -381,7 +383,7 @@
 
     // TODO(ajwong): bionic doesn't have a blank mask
     static const mask blank  = 0;
-#else  // __GLIBC__ || _WIN32 || __APPLE__ || __FreeBSD__ || __sun__
+#else  // __GLIBC__ || _WIN32 || __APPLE__ || __FreeBSD__ || EMSCRIPTEN || __sun__
     typedef unsigned long mask;
     static const mask space  = 1<<0;
     static const mask print  = 1<<1;
@@ -400,10 +402,10 @@
     _LIBCPP_ALWAYS_INLINE ctype_base() {}
 };
 
-template <class _CharT> class _LIBCPP_VISIBLE ctype;
+template <class _CharT> class _LIBCPP_TYPE_VIS ctype;
 
 template <>
-class _LIBCPP_VISIBLE ctype<wchar_t>
+class _LIBCPP_TYPE_VIS ctype<wchar_t>
     : public locale::facet,
       public ctype_base
 {
@@ -505,7 +507,7 @@
 };
 
 template <>
-class _LIBCPP_VISIBLE ctype<char>
+class _LIBCPP_TYPE_VIS ctype<char>
     : public locale::facet, public ctype_base
 {
     const mask* __tab_;
@@ -599,14 +601,12 @@
 
 #ifdef _CACHED_RUNES
     static const size_t table_size = _CACHED_RUNES;
-#elif __ANDROID__
-    static const size_t table_size = __ctype_c_mask_table_size;
 #else
     static const size_t table_size = 256;  // FIXME: Don't hardcode this.
 #endif
     _LIBCPP_ALWAYS_INLINE const mask* table() const  _NOEXCEPT {return __tab_;}
     static const mask* classic_table()  _NOEXCEPT;
-#if defined(__GLIBC__)
+#if defined(__GLIBC__) || defined(EMSCRIPTEN)
     static const int* __classic_upper_table() _NOEXCEPT;
     static const int* __classic_lower_table() _NOEXCEPT;
 #endif
@@ -625,10 +625,10 @@
 
 // template <class CharT> class ctype_byname;
 
-template <class _CharT> class _LIBCPP_VISIBLE ctype_byname;
+template <class _CharT> class _LIBCPP_TYPE_VIS ctype_byname;
 
 template <>
-class _LIBCPP_VISIBLE ctype_byname<char>
+class _LIBCPP_TYPE_VIS ctype_byname<char>
     : public ctype<char>
 {
     locale_t __l;
@@ -646,7 +646,7 @@
 };
 
 template <>
-class _LIBCPP_VISIBLE ctype_byname<wchar_t>
+class _LIBCPP_TYPE_VIS ctype_byname<wchar_t>
     : public ctype<wchar_t>
 {
     locale_t __l;
@@ -777,7 +777,7 @@
 
 // codecvt_base
 
-class _LIBCPP_VISIBLE codecvt_base
+class _LIBCPP_TYPE_VIS codecvt_base
 {
 public:
     _LIBCPP_ALWAYS_INLINE codecvt_base() {}
@@ -786,12 +786,12 @@
 
 // template <class internT, class externT, class stateT> class codecvt;
 
-template <class _InternT, class _ExternT, class _StateT> class _LIBCPP_VISIBLE codecvt;
+template <class _InternT, class _ExternT, class _StateT> class _LIBCPP_TYPE_VIS codecvt;
 
 // template <> class codecvt<char, char, mbstate_t>
 
 template <>
-class _LIBCPP_VISIBLE codecvt<char, char, mbstate_t>
+class _LIBCPP_TYPE_VIS codecvt<char, char, mbstate_t>
     : public locale::facet,
       public codecvt_base
 {
@@ -877,7 +877,7 @@
 // template <> class codecvt<wchar_t, char, mbstate_t>
 
 template <>
-class _LIBCPP_VISIBLE codecvt<wchar_t, char, mbstate_t>
+class _LIBCPP_TYPE_VIS codecvt<wchar_t, char, mbstate_t>
     : public locale::facet,
       public codecvt_base
 {
@@ -960,7 +960,7 @@
 // template <> class codecvt<char16_t, char, mbstate_t>
 
 template <>
-class _LIBCPP_VISIBLE codecvt<char16_t, char, mbstate_t>
+class _LIBCPP_TYPE_VIS codecvt<char16_t, char, mbstate_t>
     : public locale::facet,
       public codecvt_base
 {
@@ -1046,7 +1046,7 @@
 // template <> class codecvt<char32_t, char, mbstate_t>
 
 template <>
-class _LIBCPP_VISIBLE codecvt<char32_t, char, mbstate_t>
+class _LIBCPP_TYPE_VIS codecvt<char32_t, char, mbstate_t>
     : public locale::facet,
       public codecvt_base
 {
@@ -1132,7 +1132,7 @@
 // template <class _InternT, class _ExternT, class _StateT> class codecvt_byname
 
 template <class _InternT, class _ExternT, class _StateT>
-class _LIBCPP_VISIBLE codecvt_byname
+class _LIBCPP_TYPE_VIS codecvt_byname
     : public codecvt<_InternT, _ExternT, _StateT>
 {
 public:
@@ -1156,7 +1156,7 @@
 _LIBCPP_EXTERN_TEMPLATE(class codecvt_byname<char16_t, char, mbstate_t>)
 _LIBCPP_EXTERN_TEMPLATE(class codecvt_byname<char32_t, char, mbstate_t>)
 
-_LIBCPP_VISIBLE void __throw_runtime_error(const char*);
+_LIBCPP_FUNC_VIS void __throw_runtime_error(const char*);
 
 template <size_t _Np>
 struct __narrow_to_utf8
@@ -1340,10 +1340,10 @@
 
 // template <class charT> class numpunct
 
-template <class _CharT> class _LIBCPP_VISIBLE numpunct;
+template <class _CharT> class _LIBCPP_TYPE_VIS numpunct;
 
 template <>
-class _LIBCPP_VISIBLE numpunct<char>
+class _LIBCPP_TYPE_VIS numpunct<char>
     : public locale::facet
 {
 public:
@@ -1374,7 +1374,7 @@
 };
 
 template <>
-class _LIBCPP_VISIBLE numpunct<wchar_t>
+class _LIBCPP_TYPE_VIS numpunct<wchar_t>
     : public locale::facet
 {
 public:
@@ -1406,10 +1406,10 @@
 
 // template <class charT> class numpunct_byname
 
-template <class charT> class _LIBCPP_VISIBLE numpunct_byname;
+template <class charT> class _LIBCPP_TYPE_VIS numpunct_byname;
 
 template <>
-class _LIBCPP_VISIBLE numpunct_byname<char>
+class _LIBCPP_TYPE_VIS numpunct_byname<char>
 : public numpunct<char>
 {
 public:
@@ -1427,7 +1427,7 @@
 };
 
 template <>
-class _LIBCPP_VISIBLE numpunct_byname<wchar_t>
+class _LIBCPP_TYPE_VIS numpunct_byname<wchar_t>
 : public numpunct<wchar_t>
 {
 public:
diff --git a/sources/cxx-stl/llvm-libc++/include/__mutex_base b/sources/cxx-stl/llvm-libc++/libcxx/include/__mutex_base
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/include/__mutex_base
rename to sources/cxx-stl/llvm-libc++/libcxx/include/__mutex_base
index e936ad3..0583df9 100644
--- a/sources/cxx-stl/llvm-libc++/include/__mutex_base
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/__mutex_base
@@ -32,7 +32,7 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-class _LIBCPP_VISIBLE mutex
+class _LIBCPP_TYPE_VIS mutex
 {
     pthread_mutex_t __m_;
 
@@ -58,9 +58,9 @@
     _LIBCPP_INLINE_VISIBILITY native_handle_type native_handle() {return &__m_;}
 };
 
-struct _LIBCPP_VISIBLE defer_lock_t {};
-struct _LIBCPP_VISIBLE try_to_lock_t {};
-struct _LIBCPP_VISIBLE adopt_lock_t {};
+struct _LIBCPP_TYPE_VIS defer_lock_t {};
+struct _LIBCPP_TYPE_VIS try_to_lock_t {};
+struct _LIBCPP_TYPE_VIS adopt_lock_t {};
 
 #if defined(_LIBCPP_HAS_NO_CONSTEXPR) || defined(_LIBCPP_BUILDING_MUTEX)
 
@@ -77,7 +77,7 @@
 #endif
 
 template <class _Mutex>
-class _LIBCPP_VISIBLE lock_guard
+class _LIBCPP_TYPE_VIS lock_guard
 {
 public:
     typedef _Mutex mutex_type;
@@ -101,7 +101,7 @@
 };
 
 template <class _Mutex>
-class _LIBCPP_VISIBLE unique_lock
+class _LIBCPP_TYPE_VIS unique_lock
 {
 public:
     typedef _Mutex mutex_type;
@@ -285,7 +285,7 @@
 swap(unique_lock<_Mutex>& __x, unique_lock<_Mutex>& __y) _NOEXCEPT
     {__x.swap(__y);}
 
-struct _LIBCPP_VISIBLE cv_status
+struct _LIBCPP_TYPE_VIS cv_status
 {
     enum __lx {
         no_timeout,
@@ -299,7 +299,7 @@
 
 };
 
-class _LIBCPP_VISIBLE condition_variable
+class _LIBCPP_TYPE_VIS condition_variable
 {
     pthread_cond_t __cv_;
 public:
diff --git a/sources/cxx-stl/llvm-libc++/include/__split_buffer b/sources/cxx-stl/llvm-libc++/libcxx/include/__split_buffer
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/__split_buffer
rename to sources/cxx-stl/llvm-libc++/libcxx/include/__split_buffer
diff --git a/sources/cxx-stl/llvm-libc++/include/__sso_allocator b/sources/cxx-stl/llvm-libc++/libcxx/include/__sso_allocator
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/__sso_allocator
rename to sources/cxx-stl/llvm-libc++/libcxx/include/__sso_allocator
diff --git a/sources/cxx-stl/llvm-libc++/include/__std_stream b/sources/cxx-stl/llvm-libc++/libcxx/include/__std_stream
similarity index 92%
rename from sources/cxx-stl/llvm-libc++/include/__std_stream
rename to sources/cxx-stl/llvm-libc++/libcxx/include/__std_stream
index e562e2c..8ca413e 100644
--- a/sources/cxx-stl/llvm-libc++/include/__std_stream
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/__std_stream
@@ -41,7 +41,7 @@
     typedef typename traits_type::off_type   off_type;
     typedef typename traits_type::state_type state_type;
 
-    explicit __stdinbuf(FILE* __fp);
+    __stdinbuf(FILE* __fp, state_type* __st);
 
 protected:
     virtual int_type underflow();
@@ -53,7 +53,7 @@
 
     FILE* __file_;
     const codecvt<char_type, char, state_type>* __cv_;
-    state_type __st_;
+    state_type* __st_;
     int __encoding_;
     bool __always_noconv_;
 
@@ -64,9 +64,9 @@
 };
 
 template <class _CharT>
-__stdinbuf<_CharT>::__stdinbuf(FILE* __fp)
+__stdinbuf<_CharT>::__stdinbuf(FILE* __fp, state_type* __st)
     : __file_(__fp),
-      __st_()
+      __st_(__st)
 {
     imbue(this->getloc());
 }
@@ -119,15 +119,15 @@
         codecvt_base::result __r;
         do
         {
-            state_type __sv_st = __st_;
-            __r = __cv_->in(__st_, __extbuf, __extbuf + __nread, __enxt,
+            state_type __sv_st = *__st_;
+            __r = __cv_->in(*__st_, __extbuf, __extbuf + __nread, __enxt,
                                    &__1buf, &__1buf + 1, __inxt);
             switch (__r)
             {
             case _VSTD::codecvt_base::ok:
                 break;
             case codecvt_base::partial:
-                __st_ = __sv_st;
+                *__st_ = __sv_st;
                 if (__nread == sizeof(__extbuf))
                     return traits_type::eof();
                 {
@@ -150,7 +150,7 @@
     {
         for (int __i = __nread; __i > 0;)
         {
-            if (ungetc(__extbuf[--__i], __file_) == EOF)
+            if (ungetc(traits_type::to_int_type(__extbuf[--__i]), __file_) == EOF)
                 return traits_type::eof();
         }
     }
@@ -167,7 +167,7 @@
     char* __enxt;
     const char_type __ci = traits_type::to_char_type(__c);
     const char_type* __inxt;
-    switch (__cv_->out(__st_, &__ci, &__ci + 1, __inxt,
+    switch (__cv_->out(*__st_, &__ci, &__ci + 1, __inxt,
                               __extbuf, __extbuf + sizeof(__extbuf), __enxt))
     {
     case _VSTD::codecvt_base::ok:
@@ -200,7 +200,7 @@
     typedef typename traits_type::off_type   off_type;
     typedef typename traits_type::state_type state_type;
 
-    explicit __stdoutbuf(FILE* __fp);
+    __stdoutbuf(FILE* __fp, state_type* __st);
 
 protected:
     virtual int_type overflow (int_type __c = traits_type::eof());
@@ -210,7 +210,7 @@
 private:
     FILE* __file_;
     const codecvt<char_type, char, state_type>* __cv_;
-    state_type __st_;
+    state_type* __st_;
     bool __always_noconv_;
 
     __stdoutbuf(const __stdoutbuf&);
@@ -218,10 +218,10 @@
 };
 
 template <class _CharT>
-__stdoutbuf<_CharT>::__stdoutbuf(FILE* __fp)
+__stdoutbuf<_CharT>::__stdoutbuf(FILE* __fp, state_type* __st)
     : __file_(__fp),
       __cv_(&use_facet<codecvt<char_type, char, state_type> >(this->getloc())),
-      __st_(),
+      __st_(__st),
       __always_noconv_(__cv_->always_noconv())
 {
 }
@@ -249,7 +249,7 @@
             do
             {
                 const char_type* __e;
-                __r = __cv_->out(__st_, this->pbase(), this->pptr(), __e,
+                __r = __cv_->out(*__st_, this->pbase(), this->pptr(), __e,
                                         __extbuf,
                                         __extbuf + sizeof(__extbuf),
                                         __extbe);
@@ -289,7 +289,7 @@
     do
     {
         char* __extbe;
-        __r = __cv_->unshift(__st_, __extbuf,
+        __r = __cv_->unshift(*__st_, __extbuf,
                                     __extbuf + sizeof(__extbuf),
                                     __extbe);
         size_t __nmemb = static_cast<size_t>(__extbe - __extbuf);
diff --git a/sources/cxx-stl/llvm-libc++/include/__tree b/sources/cxx-stl/llvm-libc++/libcxx/include/__tree
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/__tree
rename to sources/cxx-stl/llvm-libc++/libcxx/include/__tree
index bd38b4f..cd6d7ef 100644
--- a/sources/cxx-stl/llvm-libc++/include/__tree
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/__tree
@@ -25,17 +25,17 @@
 
 template <class _Tp, class _Compare, class _Allocator> class __tree;
 template <class _Tp, class _NodePtr, class _DiffType>
-    class _LIBCPP_VISIBLE __tree_iterator;
+    class _LIBCPP_TYPE_VIS __tree_iterator;
 template <class _Tp, class _ConstNodePtr, class _DiffType>
-    class _LIBCPP_VISIBLE __tree_const_iterator;
+    class _LIBCPP_TYPE_VIS __tree_const_iterator;
 template <class _Key, class _Tp, class _Compare, class _Allocator>
-    class _LIBCPP_VISIBLE map;
+    class _LIBCPP_TYPE_VIS map;
 template <class _Key, class _Tp, class _Compare, class _Allocator>
-    class _LIBCPP_VISIBLE multimap;
+    class _LIBCPP_TYPE_VIS multimap;
 template <class _Key, class _Compare, class _Allocator>
-    class _LIBCPP_VISIBLE set;
+    class _LIBCPP_TYPE_VIS set;
 template <class _Key, class _Compare, class _Allocator>
-    class _LIBCPP_VISIBLE multiset;
+    class _LIBCPP_TYPE_VIS multiset;
 
 /*
 
@@ -614,11 +614,11 @@
 #endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
 };
 
-template <class _TreeIterator> class _LIBCPP_VISIBLE __map_iterator;
-template <class _TreeIterator> class _LIBCPP_VISIBLE __map_const_iterator;
+template <class _TreeIterator> class _LIBCPP_TYPE_VIS __map_iterator;
+template <class _TreeIterator> class _LIBCPP_TYPE_VIS __map_const_iterator;
 
 template <class _Tp, class _NodePtr, class _DiffType>
-class _LIBCPP_VISIBLE __tree_iterator
+class _LIBCPP_TYPE_VIS __tree_iterator
 {
     typedef _NodePtr                                              __node_pointer;
     typedef typename pointer_traits<__node_pointer>::element_type __node;
@@ -673,16 +673,16 @@
     _LIBCPP_INLINE_VISIBILITY
     explicit __tree_iterator(__node_pointer __p) _NOEXCEPT : __ptr_(__p) {}
     template <class, class, class> friend class __tree;
-    template <class, class, class> friend class _LIBCPP_VISIBLE __tree_const_iterator;
-    template <class> friend class _LIBCPP_VISIBLE __map_iterator;
-    template <class, class, class, class> friend class _LIBCPP_VISIBLE map;
-    template <class, class, class, class> friend class _LIBCPP_VISIBLE multimap;
-    template <class, class, class> friend class _LIBCPP_VISIBLE set;
-    template <class, class, class> friend class _LIBCPP_VISIBLE multiset;
+    template <class, class, class> friend class _LIBCPP_TYPE_VIS __tree_const_iterator;
+    template <class> friend class _LIBCPP_TYPE_VIS __map_iterator;
+    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS map;
+    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS multimap;
+    template <class, class, class> friend class _LIBCPP_TYPE_VIS set;
+    template <class, class, class> friend class _LIBCPP_TYPE_VIS multiset;
 };
 
 template <class _Tp, class _ConstNodePtr, class _DiffType>
-class _LIBCPP_VISIBLE __tree_const_iterator
+class _LIBCPP_TYPE_VIS __tree_const_iterator
 {
     typedef _ConstNodePtr                                         __node_pointer;
     typedef typename pointer_traits<__node_pointer>::element_type __node;
@@ -759,11 +759,11 @@
     explicit __tree_const_iterator(__node_pointer __p) _NOEXCEPT
         : __ptr_(__p) {}
     template <class, class, class> friend class __tree;
-    template <class, class, class, class> friend class _LIBCPP_VISIBLE map;
-    template <class, class, class, class> friend class _LIBCPP_VISIBLE multimap;
-    template <class, class, class> friend class _LIBCPP_VISIBLE set;
-    template <class, class, class> friend class _LIBCPP_VISIBLE multiset;
-    template <class> friend class _LIBCPP_VISIBLE __map_const_iterator;
+    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS map;
+    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS multimap;
+    template <class, class, class> friend class _LIBCPP_TYPE_VIS set;
+    template <class, class, class> friend class _LIBCPP_TYPE_VIS multiset;
+    template <class> friend class _LIBCPP_TYPE_VIS __map_const_iterator;
 };
 
 template <class _Tp, class _Compare, class _Allocator>
diff --git a/sources/cxx-stl/llvm-libc++/include/__tuple b/sources/cxx-stl/llvm-libc++/libcxx/include/__tuple
similarity index 91%
rename from sources/cxx-stl/llvm-libc++/include/__tuple
rename to sources/cxx-stl/llvm-libc++/libcxx/include/__tuple
index 1fa90a0..1213262 100644
--- a/sources/cxx-stl/llvm-libc++/include/__tuple
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/__tuple
@@ -27,46 +27,46 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-template <class _Tp> class _LIBCPP_VISIBLE tuple_size;
+template <class _Tp> class _LIBCPP_TYPE_VIS tuple_size;
 
 template <class _Tp>
-class _LIBCPP_VISIBLE tuple_size<const _Tp>
+class _LIBCPP_TYPE_VIS tuple_size<const _Tp>
     : public tuple_size<_Tp> {};
 
 template <class _Tp>
-class _LIBCPP_VISIBLE tuple_size<volatile _Tp>
+class _LIBCPP_TYPE_VIS tuple_size<volatile _Tp>
     : public tuple_size<_Tp> {};
 
 template <class _Tp>
-class _LIBCPP_VISIBLE tuple_size<const volatile _Tp>
+class _LIBCPP_TYPE_VIS tuple_size<const volatile _Tp>
     : public tuple_size<_Tp> {};
 
-template <size_t _Ip, class _Tp> class _LIBCPP_VISIBLE tuple_element;
+template <size_t _Ip, class _Tp> class _LIBCPP_TYPE_VIS tuple_element;
 
 template <size_t _Ip, class _Tp>
-class _LIBCPP_VISIBLE tuple_element<_Ip, const _Tp>
+class _LIBCPP_TYPE_VIS tuple_element<_Ip, const _Tp>
 {
 public:
     typedef typename add_const<typename tuple_element<_Ip, _Tp>::type>::type type;
 };
 
 template <size_t _Ip, class _Tp>
-class _LIBCPP_VISIBLE tuple_element<_Ip, volatile _Tp>
+class _LIBCPP_TYPE_VIS tuple_element<_Ip, volatile _Tp>
 {
 public:
     typedef typename add_volatile<typename tuple_element<_Ip, _Tp>::type>::type type;
 };
 
 template <size_t _Ip, class _Tp>
-class _LIBCPP_VISIBLE tuple_element<_Ip, const volatile _Tp>
+class _LIBCPP_TYPE_VIS tuple_element<_Ip, const volatile _Tp>
 {
 public:
     typedef typename add_cv<typename tuple_element<_Ip, _Tp>::type>::type type;
 };
 
-template <class ..._Tp> class _LIBCPP_VISIBLE tuple;
-template <class _T1, class _T2> struct _LIBCPP_VISIBLE pair;
-template <class _Tp, size_t _Size> struct _LIBCPP_VISIBLE array;
+template <class ..._Tp> class _LIBCPP_TYPE_VIS tuple;
+template <class _T1, class _T2> struct _LIBCPP_TYPE_VIS pair;
+template <class _Tp, size_t _Size> struct _LIBCPP_TYPE_VIS array;
 
 template <class _Tp> struct __tuple_like : false_type {};
 
@@ -154,7 +154,7 @@
 template <class ..._Tp> struct __tuple_types {};
 
 template <size_t _Ip>
-class _LIBCPP_VISIBLE tuple_element<_Ip, __tuple_types<> >
+class _LIBCPP_TYPE_VIS tuple_element<_Ip, __tuple_types<> >
 {
 public:
     static_assert(_Ip == 0, "tuple_element index out of range");
@@ -162,21 +162,21 @@
 };
 
 template <class _Hp, class ..._Tp>
-class _LIBCPP_VISIBLE tuple_element<0, __tuple_types<_Hp, _Tp...> >
+class _LIBCPP_TYPE_VIS tuple_element<0, __tuple_types<_Hp, _Tp...> >
 {
 public:
     typedef _Hp type;
 };
 
 template <size_t _Ip, class _Hp, class ..._Tp>
-class _LIBCPP_VISIBLE tuple_element<_Ip, __tuple_types<_Hp, _Tp...> >
+class _LIBCPP_TYPE_VIS tuple_element<_Ip, __tuple_types<_Hp, _Tp...> >
 {
 public:
     typedef typename tuple_element<_Ip-1, __tuple_types<_Tp...> >::type type;
 };
 
 template <class ..._Tp>
-class _LIBCPP_VISIBLE tuple_size<__tuple_types<_Tp...> >
+class _LIBCPP_TYPE_VIS tuple_size<__tuple_types<_Tp...> >
     : public integral_constant<size_t, sizeof...(_Tp)>
 {
 };
diff --git a/sources/cxx-stl/llvm-libc++/include/__tuple_03 b/sources/cxx-stl/llvm-libc++/libcxx/include/__tuple_03
similarity index 82%
rename from sources/cxx-stl/llvm-libc++/include/__tuple_03
rename to sources/cxx-stl/llvm-libc++/libcxx/include/__tuple_03
index a28ac08..605d84d 100644
--- a/sources/cxx-stl/llvm-libc++/include/__tuple_03
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/__tuple_03
@@ -19,8 +19,8 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-template <class _Tp> class _LIBCPP_VISIBLE tuple_size;
-template <size_t _Ip, class _Tp> class _LIBCPP_VISIBLE tuple_element;
+template <class _Tp> class _LIBCPP_TYPE_VIS tuple_size;
+template <size_t _Ip, class _Tp> class _LIBCPP_TYPE_VIS tuple_element;
 
 _LIBCPP_END_NAMESPACE_STD
 
diff --git a/sources/cxx-stl/llvm-libc++/include/__undef_min_max b/sources/cxx-stl/llvm-libc++/libcxx/include/__undef_min_max
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/__undef_min_max
rename to sources/cxx-stl/llvm-libc++/libcxx/include/__undef_min_max
diff --git a/sources/cxx-stl/llvm-libc++/include/algorithm b/sources/cxx-stl/llvm-libc++/libcxx/include/algorithm
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/include/algorithm
rename to sources/cxx-stl/llvm-libc++/libcxx/include/algorithm
index 0f6107b..39191db 100644
--- a/sources/cxx-stl/llvm-libc++/include/algorithm
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/algorithm
@@ -1398,7 +1398,7 @@
         // Find first element in sequence that matchs __value_, with a mininum of loop checks
         while (true)
         {
-            if (__first == __s)  // return __last if no element matches __value_
+            if (__first >= __s)  // return __last if no element matches __value_
                 return __last;
             if (__pred(*__first, __value_))
                 break;
@@ -1528,10 +1528,10 @@
 
 // copy_backward
 
-template <class _InputIterator, class _OutputIterator>
+template <class _BidirectionalIterator, class _OutputIterator>
 inline _LIBCPP_INLINE_VISIBILITY
 _OutputIterator
-__copy_backward(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
+__copy_backward(_BidirectionalIterator __first, _BidirectionalIterator __last, _OutputIterator __result)
 {
     while (__first != __last)
         *--__result = *--__last;
@@ -2764,7 +2764,7 @@
 
     __rs_default();
 public:
-    typedef unsigned result_type;
+    typedef uint_fast32_t result_type;
 
     static const result_type _Min = 0;
     static const result_type _Max = 0xFFFFFFFF;
diff --git a/sources/cxx-stl/llvm-libc++/include/array b/sources/cxx-stl/llvm-libc++/libcxx/include/array
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/include/array
rename to sources/cxx-stl/llvm-libc++/libcxx/include/array
index f4a3020..bcf5347 100644
--- a/sources/cxx-stl/llvm-libc++/include/array
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/array
@@ -118,7 +118,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 template <class _Tp, size_t _Size>
-struct _LIBCPP_VISIBLE array
+struct _LIBCPP_TYPE_VIS array
 {
     // types:
     typedef array __self;
@@ -284,22 +284,22 @@
 }
 
 template <class _Tp, size_t _Size>
-class _LIBCPP_VISIBLE tuple_size<array<_Tp, _Size> >
+class _LIBCPP_TYPE_VIS tuple_size<array<_Tp, _Size> >
     : public integral_constant<size_t, _Size> {};
 
 template <class _Tp, size_t _Size>
-class _LIBCPP_VISIBLE tuple_size<const array<_Tp, _Size> >
+class _LIBCPP_TYPE_VIS tuple_size<const array<_Tp, _Size> >
     : public integral_constant<size_t, _Size> {};
 
 template <size_t _Ip, class _Tp, size_t _Size>
-class _LIBCPP_VISIBLE tuple_element<_Ip, array<_Tp, _Size> >
+class _LIBCPP_TYPE_VIS tuple_element<_Ip, array<_Tp, _Size> >
 {
 public:
     typedef _Tp type;
 };
 
 template <size_t _Ip, class _Tp, size_t _Size>
-class _LIBCPP_VISIBLE tuple_element<_Ip, const array<_Tp, _Size> >
+class _LIBCPP_TYPE_VIS tuple_element<_Ip, const array<_Tp, _Size> >
 {
 public:
     typedef const _Tp type;
diff --git a/sources/cxx-stl/llvm-libc++/include/atomic b/sources/cxx-stl/llvm-libc++/libcxx/include/atomic
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/atomic
rename to sources/cxx-stl/llvm-libc++/libcxx/include/atomic
index 4731e4f..db67e76 100644
--- a/sources/cxx-stl/llvm-libc++/include/atomic
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/atomic
@@ -33,6 +33,7 @@
 
 // lock-free property
 
+#define ATOMIC_BOOL_LOCK_FREE unspecified
 #define ATOMIC_CHAR_LOCK_FREE unspecified
 #define ATOMIC_CHAR16_T_LOCK_FREE unspecified
 #define ATOMIC_CHAR32_T_LOCK_FREE unspecified
@@ -41,6 +42,7 @@
 #define ATOMIC_INT_LOCK_FREE unspecified
 #define ATOMIC_LONG_LOCK_FREE unspecified
 #define ATOMIC_LLONG_LOCK_FREE unspecified
+#define ATOMIC_POINTER_LOCK_FREE unspecified
 
 // flag type and operations
 
@@ -1501,14 +1503,16 @@
 
 // lock-free property
 
-#define ATOMIC_CHAR_LOCK_FREE 0
-#define ATOMIC_CHAR16_T_LOCK_FREE 0
-#define ATOMIC_CHAR32_T_LOCK_FREE 0
-#define ATOMIC_WCHAR_T_LOCK_FREE 0
-#define ATOMIC_SHORT_LOCK_FREE 0
-#define ATOMIC_INT_LOCK_FREE 0
-#define ATOMIC_LONG_LOCK_FREE 0
-#define ATOMIC_LLONG_LOCK_FREE 0
+#define ATOMIC_BOOL_LOCK_FREE      __GCC_ATOMIC_BOOL_LOCK_FREE
+#define ATOMIC_CHAR_LOCK_FREE      __GCC_ATOMIC_CHAR_LOCK_FREE
+#define ATOMIC_CHAR16_T_LOCK_FREE  __GCC_ATOMIC_CHAR16_T_LOCK_FREE
+#define ATOMIC_CHAR32_T_LOCK_FREE  __GCC_ATOMIC_CHAR32_T_LOCK_FREE
+#define ATOMIC_WCHAR_T_LOCK_FREE   __GCC_ATOMIC_WCHAR_T_LOCK_FREE
+#define ATOMIC_SHORT_LOCK_FREE     __GCC_ATOMIC_SHORT_LOCK_FREE
+#define ATOMIC_INT_LOCK_FREE       __GCC_ATOMIC_INT_LOCK_FREE
+#define ATOMIC_LONG_LOCK_FREE      __GCC_ATOMIC_LONG_LOCK_FREE
+#define ATOMIC_LLONG_LOCK_FREE     __GCC_ATOMIC_LLONG_LOCK_FREE
+#define ATOMIC_POINTER_LOCK_FREE   __GCC_ATOMIC_POINTER_LOCK_FREE
 
 #endif  //  !__has_feature(cxx_atomic)
 
diff --git a/sources/cxx-stl/llvm-libc++/include/bitset b/sources/cxx-stl/llvm-libc++/libcxx/include/bitset
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/bitset
rename to sources/cxx-stl/llvm-libc++/libcxx/include/bitset
index 1167f50..dd9be4f 100644
--- a/sources/cxx-stl/llvm-libc++/include/bitset
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/bitset
@@ -249,7 +249,13 @@
 _LIBCPP_CONSTEXPR
 __bitset<_N_words, _Size>::__bitset(unsigned long long __v) _NOEXCEPT
 #ifndef _LIBCPP_HAS_NO_CONSTEXPR
+#if __SIZE_WIDTH__ == 64
     : __first_{__v}
+#elif __SIZE_WIDTH__ == 32
+    : __first_{__v, __v >> __bits_per_word}
+#else
+#error This constructor has not been ported to this platform
+#endif
 #endif
 {
 #ifdef _LIBCPP_HAS_NO_CONSTEXPR
@@ -626,13 +632,14 @@
 {
 }
 
-template <size_t _Size> class _LIBCPP_VISIBLE bitset;
-template <size_t _Size> struct hash<bitset<_Size> >;
+template <size_t _Size> class _LIBCPP_TYPE_VIS bitset;
+template <size_t _Size> struct _LIBCPP_TYPE_VIS hash<bitset<_Size> >;
 
 template <size_t _Size>
-class _LIBCPP_VISIBLE bitset
+class _LIBCPP_TYPE_VIS bitset
     : private __bitset<_Size == 0 ? 0 : (_Size - 1) / (sizeof(size_t) * CHAR_BIT) + 1, _Size>
 {
+public:
     static const unsigned __n_words = _Size == 0 ? 0 : (_Size - 1) / (sizeof(size_t) * CHAR_BIT) + 1;
     typedef __bitset<__n_words, _Size> base;
 
@@ -1053,7 +1060,7 @@
 }
 
 template <size_t _Size>
-struct _LIBCPP_VISIBLE hash<bitset<_Size> >
+struct _LIBCPP_TYPE_VIS hash<bitset<_Size> >
     : public unary_function<bitset<_Size>, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
diff --git a/sources/cxx-stl/llvm-libc++/include/cassert b/sources/cxx-stl/llvm-libc++/libcxx/include/cassert
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/cassert
rename to sources/cxx-stl/llvm-libc++/libcxx/include/cassert
diff --git a/sources/cxx-stl/llvm-libc++/include/ccomplex b/sources/cxx-stl/llvm-libc++/libcxx/include/ccomplex
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/ccomplex
rename to sources/cxx-stl/llvm-libc++/libcxx/include/ccomplex
diff --git a/sources/cxx-stl/llvm-libc++/include/cctype b/sources/cxx-stl/llvm-libc++/libcxx/include/cctype
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/cctype
rename to sources/cxx-stl/llvm-libc++/libcxx/include/cctype
diff --git a/sources/cxx-stl/llvm-libc++/include/cerrno b/sources/cxx-stl/llvm-libc++/libcxx/include/cerrno
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/cerrno
rename to sources/cxx-stl/llvm-libc++/libcxx/include/cerrno
diff --git a/sources/cxx-stl/llvm-libc++/include/cfenv b/sources/cxx-stl/llvm-libc++/libcxx/include/cfenv
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/cfenv
rename to sources/cxx-stl/llvm-libc++/libcxx/include/cfenv
diff --git a/sources/cxx-stl/llvm-libc++/include/cfloat b/sources/cxx-stl/llvm-libc++/libcxx/include/cfloat
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/cfloat
rename to sources/cxx-stl/llvm-libc++/libcxx/include/cfloat
diff --git a/sources/cxx-stl/llvm-libc++/include/chrono b/sources/cxx-stl/llvm-libc++/libcxx/include/chrono
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/chrono
rename to sources/cxx-stl/llvm-libc++/libcxx/include/chrono
index 508c1f3..3b96e81 100644
--- a/sources/cxx-stl/llvm-libc++/include/chrono
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/chrono
@@ -279,7 +279,7 @@
 namespace chrono
 {
 
-template <class _Rep, class _Period = ratio<1> > class _LIBCPP_VISIBLE duration;
+template <class _Rep, class _Period = ratio<1> > class _LIBCPP_TYPE_VIS duration;
 
 template <class _Tp>
 struct __is_duration : false_type {};
@@ -299,7 +299,7 @@
 } // chrono
 
 template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-struct _LIBCPP_VISIBLE common_type<chrono::duration<_Rep1, _Period1>,
+struct _LIBCPP_TYPE_VIS common_type<chrono::duration<_Rep1, _Period1>,
                                    chrono::duration<_Rep2, _Period2> >
 {
     typedef chrono::duration<typename common_type<_Rep1, _Rep2>::type,
@@ -377,10 +377,10 @@
 }
 
 template <class _Rep>
-struct _LIBCPP_VISIBLE treat_as_floating_point : is_floating_point<_Rep> {};
+struct _LIBCPP_TYPE_VIS treat_as_floating_point : is_floating_point<_Rep> {};
 
 template <class _Rep>
-struct _LIBCPP_VISIBLE duration_values
+struct _LIBCPP_TYPE_VIS duration_values
 {
 public:
     _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR _Rep zero() {return _Rep(0);}
@@ -391,7 +391,7 @@
 // duration
 
 template <class _Rep, class _Period>
-class _LIBCPP_VISIBLE duration
+class _LIBCPP_TYPE_VIS duration
 {
     static_assert(!__is_duration<_Rep>::value, "A duration representation can not be a duration");
     static_assert(__is_ratio<_Period>::value, "Second template parameter of duration must be a std::ratio");
@@ -696,7 +696,7 @@
 //////////////////////////////////////////////////////////
 
 template <class _Clock, class _Duration = typename _Clock::duration>
-class _LIBCPP_VISIBLE time_point
+class _LIBCPP_TYPE_VIS time_point
 {
     static_assert(__is_duration<_Duration>::value,
                   "Second template parameter of time_point must be a std::chrono::duration");
@@ -740,7 +740,7 @@
 } // chrono
 
 template <class _Clock, class _Duration1, class _Duration2>
-struct _LIBCPP_VISIBLE common_type<chrono::time_point<_Clock, _Duration1>,
+struct _LIBCPP_TYPE_VIS common_type<chrono::time_point<_Clock, _Duration1>,
                                    chrono::time_point<_Clock, _Duration2> >
 {
     typedef chrono::time_point<_Clock, typename common_type<_Duration1, _Duration2>::type> type;
@@ -863,7 +863,7 @@
 /////////////////////// clocks ///////////////////////////
 //////////////////////////////////////////////////////////
 
-class _LIBCPP_VISIBLE system_clock
+class _LIBCPP_TYPE_VIS system_clock
 {
 public:
     typedef microseconds                     duration;
@@ -877,7 +877,7 @@
     static time_point from_time_t(time_t __t) _NOEXCEPT;
 };
 
-class _LIBCPP_VISIBLE steady_clock
+class _LIBCPP_TYPE_VIS steady_clock
 {
 public:
     typedef nanoseconds                                   duration;
diff --git a/sources/cxx-stl/llvm-libc++/include/cinttypes b/sources/cxx-stl/llvm-libc++/libcxx/include/cinttypes
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/cinttypes
rename to sources/cxx-stl/llvm-libc++/libcxx/include/cinttypes
diff --git a/sources/cxx-stl/llvm-libc++/include/ciso646 b/sources/cxx-stl/llvm-libc++/libcxx/include/ciso646
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/ciso646
rename to sources/cxx-stl/llvm-libc++/libcxx/include/ciso646
diff --git a/sources/cxx-stl/llvm-libc++/include/climits b/sources/cxx-stl/llvm-libc++/libcxx/include/climits
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/climits
rename to sources/cxx-stl/llvm-libc++/libcxx/include/climits
diff --git a/sources/cxx-stl/llvm-libc++/include/clocale b/sources/cxx-stl/llvm-libc++/libcxx/include/clocale
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/clocale
rename to sources/cxx-stl/llvm-libc++/libcxx/include/clocale
diff --git a/sources/cxx-stl/llvm-libc++/include/cmath b/sources/cxx-stl/llvm-libc++/libcxx/include/cmath
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/cmath
rename to sources/cxx-stl/llvm-libc++/libcxx/include/cmath
diff --git a/sources/cxx-stl/llvm-libc++/include/codecvt b/sources/cxx-stl/llvm-libc++/libcxx/include/codecvt
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/include/codecvt
rename to sources/cxx-stl/llvm-libc++/libcxx/include/codecvt
index 6c44e34..a6e4308 100644
--- a/sources/cxx-stl/llvm-libc++/include/codecvt
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/codecvt
@@ -179,7 +179,7 @@
 
 template <class _Elem, unsigned long _Maxcode = 0x10ffff,
           codecvt_mode _Mode = (codecvt_mode)0>
-class _LIBCPP_VISIBLE codecvt_utf8
+class _LIBCPP_TYPE_VIS codecvt_utf8
     : public __codecvt_utf8<_Elem>
 {
 public:
@@ -407,7 +407,7 @@
 
 template <class _Elem, unsigned long _Maxcode = 0x10ffff,
           codecvt_mode _Mode = (codecvt_mode)0>
-class _LIBCPP_VISIBLE codecvt_utf16
+class _LIBCPP_TYPE_VIS codecvt_utf16
     : public __codecvt_utf16<_Elem, _Mode & little_endian>
 {
 public:
@@ -530,7 +530,7 @@
 
 template <class _Elem, unsigned long _Maxcode = 0x10ffff,
           codecvt_mode _Mode = (codecvt_mode)0>
-class _LIBCPP_VISIBLE codecvt_utf8_utf16
+class _LIBCPP_TYPE_VIS codecvt_utf8_utf16
     : public __codecvt_utf8_utf16<_Elem>
 {
 public:
diff --git a/sources/cxx-stl/llvm-libc++/include/complex b/sources/cxx-stl/llvm-libc++/libcxx/include/complex
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/complex
rename to sources/cxx-stl/llvm-libc++/libcxx/include/complex
index 07d3754..a09bf70 100644
--- a/sources/cxx-stl/llvm-libc++/include/complex
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/complex
@@ -255,13 +255,13 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-template<class _Tp> class _LIBCPP_VISIBLE complex;
+template<class _Tp> class _LIBCPP_TYPE_VIS complex;
 
 template<class _Tp> complex<_Tp> operator*(const complex<_Tp>& __z, const complex<_Tp>& __w);
 template<class _Tp> complex<_Tp> operator/(const complex<_Tp>& __x, const complex<_Tp>& __y);
 
 template<class _Tp>
-class _LIBCPP_VISIBLE complex
+class _LIBCPP_TYPE_VIS complex
 {
 public:
     typedef _Tp value_type;
@@ -319,11 +319,11 @@
         }
 };
 
-template<> class _LIBCPP_VISIBLE complex<double>;
-template<> class _LIBCPP_VISIBLE complex<long double>;
+template<> class _LIBCPP_TYPE_VIS complex<double>;
+template<> class _LIBCPP_TYPE_VIS complex<long double>;
 
 template<>
-class _LIBCPP_VISIBLE complex<float>
+class _LIBCPP_TYPE_VIS complex<float>
 {
     float __re_;
     float __im_;
@@ -379,7 +379,7 @@
 };
 
 template<>
-class _LIBCPP_VISIBLE complex<double>
+class _LIBCPP_TYPE_VIS complex<double>
 {
     double __re_;
     double __im_;
@@ -435,7 +435,7 @@
 };
 
 template<>
-class _LIBCPP_VISIBLE complex<long double>
+class _LIBCPP_TYPE_VIS complex<long double>
 {
     long double __re_;
     long double __im_;
diff --git a/sources/cxx-stl/llvm-libc++/include/complex.h b/sources/cxx-stl/llvm-libc++/libcxx/include/complex.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/complex.h
rename to sources/cxx-stl/llvm-libc++/libcxx/include/complex.h
diff --git a/sources/cxx-stl/llvm-libc++/include/condition_variable b/sources/cxx-stl/llvm-libc++/libcxx/include/condition_variable
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/condition_variable
rename to sources/cxx-stl/llvm-libc++/libcxx/include/condition_variable
index b1a50ee..dc67266 100644
--- a/sources/cxx-stl/llvm-libc++/include/condition_variable
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/condition_variable
@@ -117,7 +117,7 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-class _LIBCPP_VISIBLE condition_variable_any
+class _LIBCPP_TYPE_VIS condition_variable_any
 {
     condition_variable __cv_;
     shared_ptr<mutex>  __mut_;
@@ -248,7 +248,7 @@
                       _VSTD::move(__pred));
 }
 
-_LIBCPP_VISIBLE
+_LIBCPP_FUNC_VIS
 void notify_all_at_thread_exit(condition_variable& cond, unique_lock<mutex> lk);
 
 _LIBCPP_END_NAMESPACE_STD
diff --git a/sources/cxx-stl/llvm-libc++/include/csetjmp b/sources/cxx-stl/llvm-libc++/libcxx/include/csetjmp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/csetjmp
rename to sources/cxx-stl/llvm-libc++/libcxx/include/csetjmp
diff --git a/sources/cxx-stl/llvm-libc++/include/csignal b/sources/cxx-stl/llvm-libc++/libcxx/include/csignal
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/csignal
rename to sources/cxx-stl/llvm-libc++/libcxx/include/csignal
diff --git a/sources/cxx-stl/llvm-libc++/include/cstdarg b/sources/cxx-stl/llvm-libc++/libcxx/include/cstdarg
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/cstdarg
rename to sources/cxx-stl/llvm-libc++/libcxx/include/cstdarg
diff --git a/sources/cxx-stl/llvm-libc++/include/cstdbool b/sources/cxx-stl/llvm-libc++/libcxx/include/cstdbool
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/cstdbool
rename to sources/cxx-stl/llvm-libc++/libcxx/include/cstdbool
diff --git a/sources/cxx-stl/llvm-libc++/include/cstddef b/sources/cxx-stl/llvm-libc++/libcxx/include/cstddef
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/cstddef
rename to sources/cxx-stl/llvm-libc++/libcxx/include/cstddef
index 2467089..c263772 100644
--- a/sources/cxx-stl/llvm-libc++/include/cstddef
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/cstddef
@@ -56,7 +56,7 @@
 
 #ifdef _LIBCPP_HAS_NO_NULLPTR
 
-struct _LIBCPP_VISIBLE nullptr_t
+struct _LIBCPP_TYPE_VIS nullptr_t
 {
     void* __lx;
 
diff --git a/sources/cxx-stl/llvm-libc++/include/cstdint b/sources/cxx-stl/llvm-libc++/libcxx/include/cstdint
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/cstdint
rename to sources/cxx-stl/llvm-libc++/libcxx/include/cstdint
diff --git a/sources/cxx-stl/llvm-libc++/include/cstdio b/sources/cxx-stl/llvm-libc++/libcxx/include/cstdio
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/cstdio
rename to sources/cxx-stl/llvm-libc++/libcxx/include/cstdio
diff --git a/sources/cxx-stl/llvm-libc++/include/cstdlib b/sources/cxx-stl/llvm-libc++/libcxx/include/cstdlib
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/cstdlib
rename to sources/cxx-stl/llvm-libc++/libcxx/include/cstdlib
diff --git a/sources/cxx-stl/llvm-libc++/include/cstring b/sources/cxx-stl/llvm-libc++/libcxx/include/cstring
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/cstring
rename to sources/cxx-stl/llvm-libc++/libcxx/include/cstring
index 13bb118..45075b3 100644
--- a/sources/cxx-stl/llvm-libc++/include/cstring
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/cstring
@@ -94,7 +94,7 @@
 using ::strstr;
 
 // MSVC, GNU libc and its derivates already have the correct prototype in <string.h> #ifdef __cplusplus
-#if !defined(__GLIBC__) && !defined(_MSC_VER) && !defined(__sun__)
+#if !defined(__GLIBC__) && !defined(_MSC_VER) && !defined(__sun__) && !defined(_STRING_H_CPLUSPLUS_98_CONFORMANCE_)
 inline _LIBCPP_INLINE_VISIBILITY       char* strchr(      char* __s, int __c) {return ::strchr(__s, __c);}
 inline _LIBCPP_INLINE_VISIBILITY       char* strpbrk(      char* __s1, const char* __s2) {return ::strpbrk(__s1, __s2);}
 inline _LIBCPP_INLINE_VISIBILITY       char* strrchr(      char* __s, int __c) {return ::strrchr(__s, __c);}
diff --git a/sources/cxx-stl/llvm-libc++/include/ctgmath b/sources/cxx-stl/llvm-libc++/libcxx/include/ctgmath
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/ctgmath
rename to sources/cxx-stl/llvm-libc++/libcxx/include/ctgmath
diff --git a/sources/cxx-stl/llvm-libc++/include/ctime b/sources/cxx-stl/llvm-libc++/libcxx/include/ctime
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/ctime
rename to sources/cxx-stl/llvm-libc++/libcxx/include/ctime
diff --git a/sources/cxx-stl/llvm-libc++/include/cwchar b/sources/cxx-stl/llvm-libc++/libcxx/include/cwchar
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/include/cwchar
rename to sources/cxx-stl/llvm-libc++/libcxx/include/cwchar
index eed6de1..845ccec 100644
--- a/sources/cxx-stl/llvm-libc++/include/cwchar
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/cwchar
@@ -106,7 +106,7 @@
 #include <__config>
 #include <cwctype>
 #include <wchar.h>
-#if _WIN32
+#ifdef _WIN32
 #include <support/win32/support.h> // pull in *swprintf defines
 #endif // _WIN32
 
@@ -167,28 +167,37 @@
 using ::wcsncmp;
 using ::wcsxfrm;
 
+#if defined(_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_)
+
+using ::wcschr;
+using ::wcspbrk;
+using ::wcsrchr;
+using ::wcsstr;
+using ::wmemchr;
+
+#else
+
 inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wcschr(const wchar_t* __s, wchar_t __c) {return ::wcschr(__s, __c);}
 inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wcschr(      wchar_t* __s, wchar_t __c) {return ::wcschr(__s, __c);}
 
-using ::wcscspn;
-using ::wcslen;
-
 inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wcspbrk(const wchar_t* __s1, const wchar_t* __s2) {return ::wcspbrk(__s1, __s2);}
 inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wcspbrk(      wchar_t* __s1, const wchar_t* __s2) {return ::wcspbrk(__s1, __s2);}
 
 inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wcsrchr(const wchar_t* __s, wchar_t __c) {return ::wcsrchr(__s, __c);}
 inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wcsrchr(      wchar_t* __s, wchar_t __c) {return ::wcsrchr(__s, __c);}
 
-using ::wcsspn;
-
 inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wcsstr(const wchar_t* __s1, const wchar_t* __s2) {return ::wcsstr(__s1, __s2);}
 inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wcsstr(      wchar_t* __s1, const wchar_t* __s2) {return ::wcsstr(__s1, __s2);}
 
-using ::wcstok;
-
 inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wmemchr(const wchar_t* __s, wchar_t __c, size_t __n) {return ::wmemchr(__s, __c, __n);}
 inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wmemchr(      wchar_t* __s, wchar_t __c, size_t __n) {return ::wmemchr(__s, __c, __n);}
 
+#endif
+
+using ::wcscspn;
+using ::wcslen;
+using ::wcsspn;
+using ::wcstok;
 using ::wmemcmp;
 using ::wmemcpy;
 using ::wmemmove;
diff --git a/sources/cxx-stl/llvm-libc++/include/cwctype b/sources/cxx-stl/llvm-libc++/libcxx/include/cwctype
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/cwctype
rename to sources/cxx-stl/llvm-libc++/libcxx/include/cwctype
diff --git a/sources/cxx-stl/llvm-libc++/include/deque b/sources/cxx-stl/llvm-libc++/libcxx/include/deque
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/include/deque
rename to sources/cxx-stl/llvm-libc++/libcxx/include/deque
index b86d77f..8e09822 100644
--- a/sources/cxx-stl/llvm-libc++/include/deque
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/deque
@@ -170,7 +170,7 @@
 
 template <class _ValueType, class _Pointer, class _Reference, class _MapPointer,
           class _DiffType, _DiffType _BlockSize>
-class _LIBCPP_VISIBLE __deque_iterator;
+class _LIBCPP_TYPE_VIS __deque_iterator;
 
 template <class _RAIter,
           class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
@@ -262,7 +262,7 @@
 
 template <class _ValueType, class _Pointer, class _Reference, class _MapPointer,
           class _DiffType, _DiffType _BlockSize>
-class _LIBCPP_VISIBLE __deque_iterator
+class _LIBCPP_TYPE_VIS __deque_iterator
 {
     typedef _MapPointer __map_iterator;
 public:
@@ -410,9 +410,9 @@
         : __m_iter_(__m), __ptr_(__p) {}
 
     template <class _Tp, class _Ap> friend class __deque_base;
-    template <class _Tp, class _Ap> friend class _LIBCPP_VISIBLE deque;
+    template <class _Tp, class _Ap> friend class _LIBCPP_TYPE_VIS deque;
     template <class _Vp, class _Pp, class _Rp, class _MP, class _Dp, _Dp>
-        friend class _LIBCPP_VISIBLE __deque_iterator;
+        friend class _LIBCPP_TYPE_VIS __deque_iterator;
 
     template <class _RAIter,
               class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
@@ -1167,7 +1167,7 @@
 }
 
 template <class _Tp, class _Allocator = allocator<_Tp> >
-class _LIBCPP_VISIBLE deque
+class _LIBCPP_TYPE_VIS deque
     : private __deque_base<_Tp, _Allocator>
 {
 public:
diff --git a/sources/cxx-stl/llvm-libc++/include/exception b/sources/cxx-stl/llvm-libc++/libcxx/include/exception
similarity index 92%
rename from sources/cxx-stl/llvm-libc++/include/exception
rename to sources/cxx-stl/llvm-libc++/libcxx/include/exception
index 51a48c8..37bfc57 100644
--- a/sources/cxx-stl/llvm-libc++/include/exception
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/exception
@@ -105,23 +105,23 @@
 };
 
 typedef void (*unexpected_handler)();
-_LIBCPP_VISIBLE unexpected_handler set_unexpected(unexpected_handler) _NOEXCEPT;
-_LIBCPP_VISIBLE unexpected_handler get_unexpected() _NOEXCEPT;
-_LIBCPP_NORETURN _LIBCPP_VISIBLE void unexpected();
+_LIBCPP_FUNC_VIS unexpected_handler set_unexpected(unexpected_handler) _NOEXCEPT;
+_LIBCPP_FUNC_VIS unexpected_handler get_unexpected() _NOEXCEPT;
+_LIBCPP_NORETURN _LIBCPP_FUNC_VIS void unexpected();
 
 typedef void (*terminate_handler)();
-_LIBCPP_VISIBLE terminate_handler set_terminate(terminate_handler) _NOEXCEPT;
-_LIBCPP_VISIBLE terminate_handler get_terminate() _NOEXCEPT;
-_LIBCPP_NORETURN _LIBCPP_VISIBLE void terminate() _NOEXCEPT;
+_LIBCPP_FUNC_VIS terminate_handler set_terminate(terminate_handler) _NOEXCEPT;
+_LIBCPP_FUNC_VIS terminate_handler get_terminate() _NOEXCEPT;
+_LIBCPP_NORETURN _LIBCPP_FUNC_VIS void terminate() _NOEXCEPT;
 
-_LIBCPP_VISIBLE bool uncaught_exception() _NOEXCEPT;
+_LIBCPP_FUNC_VIS bool uncaught_exception() _NOEXCEPT;
 
-class _LIBCPP_VISIBLE exception_ptr;
+class _LIBCPP_TYPE_VIS exception_ptr;
 
 exception_ptr current_exception() _NOEXCEPT;
 _LIBCPP_NORETURN void rethrow_exception(exception_ptr);
 
-class _LIBCPP_VISIBLE exception_ptr
+class _LIBCPP_TYPE_VIS exception_ptr
 {
     void* __ptr_;
 public:
diff --git a/sources/cxx-stl/llvm-libc++/include/ext/__hash b/sources/cxx-stl/llvm-libc++/libcxx/include/ext/__hash
similarity index 84%
rename from sources/cxx-stl/llvm-libc++/include/ext/__hash
rename to sources/cxx-stl/llvm-libc++/libcxx/include/ext/__hash
index 21500e8..f6ecfe3 100644
--- a/sources/cxx-stl/llvm-libc++/include/ext/__hash
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/ext/__hash
@@ -19,10 +19,10 @@
 namespace __gnu_cxx {
 using namespace std;
 
-template <typename T> struct _LIBCPP_VISIBLE hash : public std::hash<T>
+template <typename T> struct _LIBCPP_TYPE_VIS hash : public std::hash<T>
     { };
 
-template <> struct _LIBCPP_VISIBLE hash<const char*>
+template <> struct _LIBCPP_TYPE_VIS hash<const char*>
     : public unary_function<const char*, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -32,7 +32,7 @@
     }
 };
 
-template <> struct _LIBCPP_VISIBLE hash<char *>
+template <> struct _LIBCPP_TYPE_VIS hash<char *>
     : public unary_function<char*, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
diff --git a/sources/cxx-stl/llvm-libc++/include/ext/hash_map b/sources/cxx-stl/llvm-libc++/libcxx/include/ext/hash_map
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/ext/hash_map
rename to sources/cxx-stl/llvm-libc++/libcxx/include/ext/hash_map
index bebdccb..a6fe894 100644
--- a/sources/cxx-stl/llvm-libc++/include/ext/hash_map
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/ext/hash_map
@@ -361,7 +361,7 @@
 };
 
 template <class _HashIterator>
-class _LIBCPP_VISIBLE __hash_map_iterator
+class _LIBCPP_TYPE_VIS __hash_map_iterator
 {
     _HashIterator __i_;
 
@@ -404,15 +404,15 @@
     bool operator!=(const __hash_map_iterator& __x, const __hash_map_iterator& __y)
         {return __x.__i_ != __y.__i_;}
 
-    template <class, class, class, class, class> friend class _LIBCPP_VISIBLE hash_map;
-    template <class, class, class, class, class> friend class _LIBCPP_VISIBLE hash_multimap;
-    template <class> friend class _LIBCPP_VISIBLE __hash_const_iterator;
-    template <class> friend class _LIBCPP_VISIBLE __hash_const_local_iterator;
-    template <class> friend class _LIBCPP_VISIBLE __hash_map_const_iterator;
+    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS hash_map;
+    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS hash_multimap;
+    template <class> friend class _LIBCPP_TYPE_VIS __hash_const_iterator;
+    template <class> friend class _LIBCPP_TYPE_VIS __hash_const_local_iterator;
+    template <class> friend class _LIBCPP_TYPE_VIS __hash_map_const_iterator;
 };
 
 template <class _HashIterator>
-class _LIBCPP_VISIBLE __hash_map_const_iterator
+class _LIBCPP_TYPE_VIS __hash_map_const_iterator
 {
     _HashIterator __i_;
 
@@ -463,15 +463,15 @@
     bool operator!=(const __hash_map_const_iterator& __x, const __hash_map_const_iterator& __y)
         {return __x.__i_ != __y.__i_;}
 
-    template <class, class, class, class, class> friend class _LIBCPP_VISIBLE hash_map;
-    template <class, class, class, class, class> friend class _LIBCPP_VISIBLE hash_multimap;
-    template <class> friend class _LIBCPP_VISIBLE __hash_const_iterator;
-    template <class> friend class _LIBCPP_VISIBLE __hash_const_local_iterator;
+    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS hash_map;
+    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS hash_multimap;
+    template <class> friend class _LIBCPP_TYPE_VIS __hash_const_iterator;
+    template <class> friend class _LIBCPP_TYPE_VIS __hash_const_local_iterator;
 };
 
 template <class _Key, class _Tp, class _Hash = hash<_Key>, class _Pred = equal_to<_Key>,
           class _Alloc = allocator<pair<const _Key, _Tp> > >
-class _LIBCPP_VISIBLE hash_map
+class _LIBCPP_TYPE_VIS hash_map
 {
 public:
     // types
@@ -750,7 +750,7 @@
 
 template <class _Key, class _Tp, class _Hash = hash<_Key>, class _Pred = equal_to<_Key>,
           class _Alloc = allocator<pair<const _Key, _Tp> > >
-class _LIBCPP_VISIBLE hash_multimap
+class _LIBCPP_TYPE_VIS hash_multimap
 {
 public:
     // types
diff --git a/sources/cxx-stl/llvm-libc++/include/ext/hash_set b/sources/cxx-stl/llvm-libc++/libcxx/include/ext/hash_set
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/include/ext/hash_set
rename to sources/cxx-stl/llvm-libc++/libcxx/include/ext/hash_set
index 14daf7b..52bbeee 100644
--- a/sources/cxx-stl/llvm-libc++/include/ext/hash_set
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/ext/hash_set
@@ -208,7 +208,7 @@
 
 template <class _Value, class _Hash = hash<_Value>, class _Pred = equal_to<_Value>,
           class _Alloc = allocator<_Value> >
-class _LIBCPP_VISIBLE hash_set
+class _LIBCPP_TYPE_VIS hash_set
 {
 public:
     // types
@@ -429,7 +429,7 @@
 
 template <class _Value, class _Hash = hash<_Value>, class _Pred = equal_to<_Value>,
           class _Alloc = allocator<_Value> >
-class _LIBCPP_VISIBLE hash_multiset
+class _LIBCPP_TYPE_VIS hash_multiset
 {
 public:
     // types
diff --git a/sources/cxx-stl/llvm-libc++/include/forward_list b/sources/cxx-stl/llvm-libc++/libcxx/include/forward_list
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/forward_list
rename to sources/cxx-stl/llvm-libc++/libcxx/include/forward_list
index 404c6eb..0cbf2fd 100644
--- a/sources/cxx-stl/llvm-libc++/include/forward_list
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/forward_list
@@ -212,11 +212,11 @@
     value_type __value_;
 };
 
-template<class _Tp, class _Alloc> class _LIBCPP_VISIBLE forward_list;
-template<class _NodeConstPtr> class _LIBCPP_VISIBLE __forward_list_const_iterator;
+template<class _Tp, class _Alloc> class _LIBCPP_TYPE_VIS forward_list;
+template<class _NodeConstPtr> class _LIBCPP_TYPE_VIS __forward_list_const_iterator;
 
 template <class _NodePtr>
-class _LIBCPP_VISIBLE __forward_list_iterator
+class _LIBCPP_TYPE_VIS __forward_list_iterator
 {
     typedef _NodePtr __node_pointer;
 
@@ -225,8 +225,8 @@
     _LIBCPP_INLINE_VISIBILITY
     explicit __forward_list_iterator(__node_pointer __p) _NOEXCEPT : __ptr_(__p) {}
 
-    template<class, class> friend class _LIBCPP_VISIBLE forward_list;
-    template<class> friend class _LIBCPP_VISIBLE __forward_list_const_iterator;
+    template<class, class> friend class _LIBCPP_TYPE_VIS forward_list;
+    template<class> friend class _LIBCPP_TYPE_VIS __forward_list_const_iterator;
 
 public:
     typedef forward_iterator_tag                              iterator_category;
@@ -276,7 +276,7 @@
 };
 
 template <class _NodeConstPtr>
-class _LIBCPP_VISIBLE __forward_list_const_iterator
+class _LIBCPP_TYPE_VIS __forward_list_const_iterator
 {
     typedef _NodeConstPtr __node_const_pointer;
 
@@ -533,7 +533,7 @@
 }
 
 template <class _Tp, class _Alloc = allocator<_Tp> >
-class _LIBCPP_VISIBLE forward_list
+class _LIBCPP_TYPE_VIS forward_list
     : private __forward_list_base<_Tp, _Alloc>
 {
     typedef __forward_list_base<_Tp, _Alloc> base;
diff --git a/sources/cxx-stl/llvm-libc++/include/fstream b/sources/cxx-stl/llvm-libc++/libcxx/include/fstream
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/fstream
rename to sources/cxx-stl/llvm-libc++/libcxx/include/fstream
index 1b8e7a0..e3f8306 100644
--- a/sources/cxx-stl/llvm-libc++/include/fstream
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/fstream
@@ -180,7 +180,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 template <class _CharT, class _Traits>
-class _LIBCPP_VISIBLE basic_filebuf
+class _LIBCPP_TYPE_VIS basic_filebuf
     : public basic_streambuf<_CharT, _Traits>
 {
 public:
@@ -807,9 +807,15 @@
     default:
         return pos_type(off_type(-1));
     }
+#if _WIN32
+    if (fseek(__file_, __width > 0 ? __width * __off : 0, __whence))
+        return pos_type(off_type(-1));
+    pos_type __r = ftell(__file_);
+#else
     if (fseeko(__file_, __width > 0 ? __width * __off : 0, __whence))
         return pos_type(off_type(-1));
     pos_type __r = ftello(__file_);
+#endif
     __r.state(__st_);
     return __r;
 }
@@ -820,8 +826,13 @@
 {
     if (__file_ == 0 || sync())
         return pos_type(off_type(-1));
+#if _WIN32
+    if (fseek(__file_, __sp, SEEK_SET))
+        return pos_type(off_type(-1));
+#else
     if (fseeko(__file_, __sp, SEEK_SET))
         return pos_type(off_type(-1));
+#endif
     __st_ = __sp.state();
     return __sp;
 }
@@ -880,8 +891,13 @@
                 }
             }
         }
+#if _WIN32
+        if (fseek(__file_, -__c, SEEK_CUR))
+            return -1;
+#else
         if (fseeko(__file_, -__c, SEEK_CUR))
             return -1;
+#endif
         if (__update_st)
             __st_ = __state;
         __extbufnext_ = __extbufend_ = __extbuf_;
@@ -978,7 +994,7 @@
 // basic_ifstream
 
 template <class _CharT, class _Traits>
-class _LIBCPP_VISIBLE basic_ifstream
+class _LIBCPP_TYPE_VIS basic_ifstream
     : public basic_istream<_CharT, _Traits>
 {
 public:
@@ -1123,7 +1139,7 @@
 // basic_ofstream
 
 template <class _CharT, class _Traits>
-class _LIBCPP_VISIBLE basic_ofstream
+class _LIBCPP_TYPE_VIS basic_ofstream
     : public basic_ostream<_CharT, _Traits>
 {
 public:
@@ -1268,7 +1284,7 @@
 // basic_fstream
 
 template <class _CharT, class _Traits>
-class _LIBCPP_VISIBLE basic_fstream
+class _LIBCPP_TYPE_VIS basic_fstream
     : public basic_iostream<_CharT, _Traits>
 {
 public:
diff --git a/sources/cxx-stl/llvm-libc++/include/functional b/sources/cxx-stl/llvm-libc++/libcxx/include/functional
similarity index 92%
rename from sources/cxx-stl/llvm-libc++/include/functional
rename to sources/cxx-stl/llvm-libc++/libcxx/include/functional
index ec5c5e5..995db56 100644
--- a/sources/cxx-stl/llvm-libc++/include/functional
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/functional
@@ -474,63 +474,63 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE plus : binary_function<_Tp, _Tp, _Tp>
+struct _LIBCPP_TYPE_VIS plus : binary_function<_Tp, _Tp, _Tp>
 {
     _LIBCPP_INLINE_VISIBILITY _Tp operator()(const _Tp& __x, const _Tp& __y) const
         {return __x + __y;}
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE minus : binary_function<_Tp, _Tp, _Tp>
+struct _LIBCPP_TYPE_VIS minus : binary_function<_Tp, _Tp, _Tp>
 {
     _LIBCPP_INLINE_VISIBILITY _Tp operator()(const _Tp& __x, const _Tp& __y) const
         {return __x - __y;}
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE multiplies : binary_function<_Tp, _Tp, _Tp>
+struct _LIBCPP_TYPE_VIS multiplies : binary_function<_Tp, _Tp, _Tp>
 {
     _LIBCPP_INLINE_VISIBILITY _Tp operator()(const _Tp& __x, const _Tp& __y) const
         {return __x * __y;}
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE divides : binary_function<_Tp, _Tp, _Tp>
+struct _LIBCPP_TYPE_VIS divides : binary_function<_Tp, _Tp, _Tp>
 {
     _LIBCPP_INLINE_VISIBILITY _Tp operator()(const _Tp& __x, const _Tp& __y) const
         {return __x / __y;}
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE modulus : binary_function<_Tp, _Tp, _Tp>
+struct _LIBCPP_TYPE_VIS modulus : binary_function<_Tp, _Tp, _Tp>
 {
     _LIBCPP_INLINE_VISIBILITY _Tp operator()(const _Tp& __x, const _Tp& __y) const
         {return __x % __y;}
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE negate : unary_function<_Tp, _Tp>
+struct _LIBCPP_TYPE_VIS negate : unary_function<_Tp, _Tp>
 {
     _LIBCPP_INLINE_VISIBILITY _Tp operator()(const _Tp& __x) const
         {return -__x;}
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE equal_to : binary_function<_Tp, _Tp, bool>
+struct _LIBCPP_TYPE_VIS equal_to : binary_function<_Tp, _Tp, bool>
 {
     _LIBCPP_INLINE_VISIBILITY bool operator()(const _Tp& __x, const _Tp& __y) const
         {return __x == __y;}
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE not_equal_to : binary_function<_Tp, _Tp, bool>
+struct _LIBCPP_TYPE_VIS not_equal_to : binary_function<_Tp, _Tp, bool>
 {
     _LIBCPP_INLINE_VISIBILITY bool operator()(const _Tp& __x, const _Tp& __y) const
         {return __x != __y;}
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE greater : binary_function<_Tp, _Tp, bool>
+struct _LIBCPP_TYPE_VIS greater : binary_function<_Tp, _Tp, bool>
 {
     _LIBCPP_INLINE_VISIBILITY bool operator()(const _Tp& __x, const _Tp& __y) const
         {return __x > __y;}
@@ -539,63 +539,63 @@
 // less in <__functional_base>
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE greater_equal : binary_function<_Tp, _Tp, bool>
+struct _LIBCPP_TYPE_VIS greater_equal : binary_function<_Tp, _Tp, bool>
 {
     _LIBCPP_INLINE_VISIBILITY bool operator()(const _Tp& __x, const _Tp& __y) const
         {return __x >= __y;}
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE less_equal : binary_function<_Tp, _Tp, bool>
+struct _LIBCPP_TYPE_VIS less_equal : binary_function<_Tp, _Tp, bool>
 {
     _LIBCPP_INLINE_VISIBILITY bool operator()(const _Tp& __x, const _Tp& __y) const
         {return __x <= __y;}
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE logical_and : binary_function<_Tp, _Tp, bool>
+struct _LIBCPP_TYPE_VIS logical_and : binary_function<_Tp, _Tp, bool>
 {
     _LIBCPP_INLINE_VISIBILITY bool operator()(const _Tp& __x, const _Tp& __y) const
         {return __x && __y;}
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE logical_or : binary_function<_Tp, _Tp, bool>
+struct _LIBCPP_TYPE_VIS logical_or : binary_function<_Tp, _Tp, bool>
 {
     _LIBCPP_INLINE_VISIBILITY bool operator()(const _Tp& __x, const _Tp& __y) const
         {return __x || __y;}
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE logical_not : unary_function<_Tp, bool>
+struct _LIBCPP_TYPE_VIS logical_not : unary_function<_Tp, bool>
 {
     _LIBCPP_INLINE_VISIBILITY bool operator()(const _Tp& __x) const
         {return !__x;}
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE bit_and : binary_function<_Tp, _Tp, _Tp>
+struct _LIBCPP_TYPE_VIS bit_and : binary_function<_Tp, _Tp, _Tp>
 {
     _LIBCPP_INLINE_VISIBILITY _Tp operator()(const _Tp& __x, const _Tp& __y) const
         {return __x & __y;}
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE bit_or : binary_function<_Tp, _Tp, _Tp>
+struct _LIBCPP_TYPE_VIS bit_or : binary_function<_Tp, _Tp, _Tp>
 {
     _LIBCPP_INLINE_VISIBILITY _Tp operator()(const _Tp& __x, const _Tp& __y) const
         {return __x | __y;}
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE bit_xor : binary_function<_Tp, _Tp, _Tp>
+struct _LIBCPP_TYPE_VIS bit_xor : binary_function<_Tp, _Tp, _Tp>
 {
     _LIBCPP_INLINE_VISIBILITY _Tp operator()(const _Tp& __x, const _Tp& __y) const
         {return __x ^ __y;}
 };
 
 template <class _Predicate>
-class _LIBCPP_VISIBLE unary_negate
+class _LIBCPP_TYPE_VIS unary_negate
     : public unary_function<typename _Predicate::argument_type, bool>
 {
     _Predicate __pred_;
@@ -612,7 +612,7 @@
 not1(const _Predicate& __pred) {return unary_negate<_Predicate>(__pred);}
 
 template <class _Predicate>
-class _LIBCPP_VISIBLE binary_negate
+class _LIBCPP_TYPE_VIS binary_negate
     : public binary_function<typename _Predicate::first_argument_type,
                              typename _Predicate::second_argument_type,
                              bool>
@@ -632,7 +632,7 @@
 not2(const _Predicate& __pred) {return binary_negate<_Predicate>(__pred);}
 
 template <class __Operation>
-class _LIBCPP_VISIBLE binder1st
+class _LIBCPP_TYPE_VIS binder1st
     : public unary_function<typename __Operation::second_argument_type,
                             typename __Operation::result_type>
 {
@@ -658,7 +658,7 @@
     {return binder1st<__Operation>(__op, __x);}
 
 template <class __Operation>
-class _LIBCPP_VISIBLE binder2nd
+class _LIBCPP_TYPE_VIS binder2nd
     : public unary_function<typename __Operation::first_argument_type,
                             typename __Operation::result_type>
 {
@@ -684,7 +684,7 @@
     {return binder2nd<__Operation>(__op, __x);}
 
 template <class _Arg, class _Result>
-class _LIBCPP_VISIBLE pointer_to_unary_function
+class _LIBCPP_TYPE_VIS pointer_to_unary_function
     : public unary_function<_Arg, _Result>
 {
     _Result (*__f_)(_Arg);
@@ -702,7 +702,7 @@
     {return pointer_to_unary_function<_Arg,_Result>(__f);}
 
 template <class _Arg1, class _Arg2, class _Result>
-class _LIBCPP_VISIBLE pointer_to_binary_function
+class _LIBCPP_TYPE_VIS pointer_to_binary_function
     : public binary_function<_Arg1, _Arg2, _Result>
 {
     _Result (*__f_)(_Arg1, _Arg2);
@@ -720,7 +720,7 @@
     {return pointer_to_binary_function<_Arg1,_Arg2,_Result>(__f);}
 
 template<class _Sp, class _Tp>
-class _LIBCPP_VISIBLE mem_fun_t : public unary_function<_Tp*, _Sp>
+class _LIBCPP_TYPE_VIS mem_fun_t : public unary_function<_Tp*, _Sp>
 {
     _Sp (_Tp::*__p_)();
 public:
@@ -731,7 +731,7 @@
 };
 
 template<class _Sp, class _Tp, class _Ap>
-class _LIBCPP_VISIBLE mem_fun1_t : public binary_function<_Tp*, _Ap, _Sp>
+class _LIBCPP_TYPE_VIS mem_fun1_t : public binary_function<_Tp*, _Ap, _Sp>
 {
     _Sp (_Tp::*__p_)(_Ap);
 public:
@@ -754,7 +754,7 @@
     {return mem_fun1_t<_Sp,_Tp,_Ap>(__f);}
 
 template<class _Sp, class _Tp>
-class _LIBCPP_VISIBLE mem_fun_ref_t : public unary_function<_Tp, _Sp>
+class _LIBCPP_TYPE_VIS mem_fun_ref_t : public unary_function<_Tp, _Sp>
 {
     _Sp (_Tp::*__p_)();
 public:
@@ -765,7 +765,7 @@
 };
 
 template<class _Sp, class _Tp, class _Ap>
-class _LIBCPP_VISIBLE mem_fun1_ref_t : public binary_function<_Tp, _Ap, _Sp>
+class _LIBCPP_TYPE_VIS mem_fun1_ref_t : public binary_function<_Tp, _Ap, _Sp>
 {
     _Sp (_Tp::*__p_)(_Ap);
 public:
@@ -788,7 +788,7 @@
     {return mem_fun1_ref_t<_Sp,_Tp,_Ap>(__f);}
 
 template <class _Sp, class _Tp>
-class _LIBCPP_VISIBLE const_mem_fun_t : public unary_function<const _Tp*, _Sp>
+class _LIBCPP_TYPE_VIS const_mem_fun_t : public unary_function<const _Tp*, _Sp>
 {
     _Sp (_Tp::*__p_)() const;
 public:
@@ -799,7 +799,7 @@
 };
 
 template <class _Sp, class _Tp, class _Ap>
-class _LIBCPP_VISIBLE const_mem_fun1_t : public binary_function<const _Tp*, _Ap, _Sp>
+class _LIBCPP_TYPE_VIS const_mem_fun1_t : public binary_function<const _Tp*, _Ap, _Sp>
 {
     _Sp (_Tp::*__p_)(_Ap) const;
 public:
@@ -822,7 +822,7 @@
     {return const_mem_fun1_t<_Sp,_Tp,_Ap>(__f);}
 
 template <class _Sp, class _Tp>
-class _LIBCPP_VISIBLE const_mem_fun_ref_t : public unary_function<_Tp, _Sp>
+class _LIBCPP_TYPE_VIS const_mem_fun_ref_t : public unary_function<_Tp, _Sp>
 {
     _Sp (_Tp::*__p_)() const;
 public:
@@ -833,7 +833,7 @@
 };
 
 template <class _Sp, class _Tp, class _Ap>
-class _LIBCPP_VISIBLE const_mem_fun1_ref_t
+class _LIBCPP_TYPE_VIS const_mem_fun1_ref_t
     : public binary_function<_Tp, _Ap, _Sp>
 {
     _Sp (_Tp::*__p_)(_Ap) const;
@@ -932,7 +932,7 @@
 {
 };
 
-template<class _Fp> class _LIBCPP_VISIBLE function; // undefined
+template<class _Fp> class _LIBCPP_TYPE_VIS function; // undefined
 
 namespace __function
 {
@@ -1083,12 +1083,12 @@
 }  // __function
 
 template<class _Rp, class ..._ArgTypes>
-class _LIBCPP_VISIBLE function<_Rp(_ArgTypes...)>
+class _LIBCPP_TYPE_VIS function<_Rp(_ArgTypes...)>
     : public __function::__maybe_derive_from_unary_function<_Rp(_ArgTypes...)>,
       public __function::__maybe_derive_from_binary_function<_Rp(_ArgTypes...)>
 {
     typedef __function::__base<_Rp(_ArgTypes...)> __base;
-    aligned_storage<3*sizeof(void*)>::type __buf_;
+    typename aligned_storage<3*sizeof(void*)>::type __buf_;
     __base* __f_;
 
     template <class _Fp>
@@ -1496,11 +1496,11 @@
 {return __x.swap(__y);}
 
 template<class _Tp> struct __is_bind_expression : public false_type {};
-template<class _Tp> struct _LIBCPP_VISIBLE is_bind_expression
+template<class _Tp> struct _LIBCPP_TYPE_VIS is_bind_expression
     : public __is_bind_expression<typename remove_cv<_Tp>::type> {};
 
 template<class _Tp> struct __is_placeholder : public integral_constant<int, 0> {};
-template<class _Tp> struct _LIBCPP_VISIBLE is_placeholder
+template<class _Tp> struct _LIBCPP_TYPE_VIS is_placeholder
     : public __is_placeholder<typename remove_cv<_Tp>::type> {};
 
 namespace placeholders
@@ -1624,16 +1624,38 @@
     : public ____mu_return<_Ti,
                            __is_reference_wrapper<_Ti>::value,
                            is_bind_expression<_Ti>::value,
-                           0 < is_placeholder<_Ti>::value,
+                           0 < is_placeholder<_Ti>::value &&
+                           is_placeholder<_Ti>::value <= tuple_size<_TupleUj>::value,
                            _TupleUj>
 {
 };
 
 template <class _Fp, class _BoundArgs, class _TupleUj>
+struct _is_valid_bind_return
+{
+    static const bool value = false;
+};
+
+template <class _Fp, class ..._BoundArgs, class _TupleUj>
+struct _is_valid_bind_return<_Fp, tuple<_BoundArgs...>, _TupleUj>
+{
+    static const bool value = __invokable<_Fp,
+                    typename __mu_return<_BoundArgs, _TupleUj>::type...>::value;
+};
+
+template <class _Fp, class ..._BoundArgs, class _TupleUj>
+struct _is_valid_bind_return<_Fp, const tuple<_BoundArgs...>, _TupleUj>
+{
+    static const bool value = __invokable<_Fp,
+                    typename __mu_return<const _BoundArgs, _TupleUj>::type...>::value;
+};
+
+template <class _Fp, class _BoundArgs, class _TupleUj,
+          bool = _is_valid_bind_return<_Fp, _BoundArgs, _TupleUj>::value>
 struct __bind_return;
 
 template <class _Fp, class ..._BoundArgs, class _TupleUj>
-struct __bind_return<_Fp, tuple<_BoundArgs...>, _TupleUj>
+struct __bind_return<_Fp, tuple<_BoundArgs...>, _TupleUj, true>
 {
     typedef typename __invoke_of
     <
@@ -1647,7 +1669,7 @@
 };
 
 template <class _Fp, class ..._BoundArgs, class _TupleUj>
-struct __bind_return<_Fp, const tuple<_BoundArgs...>, _TupleUj>
+struct __bind_return<_Fp, const tuple<_BoundArgs...>, _TupleUj, true>
 {
     typedef typename __invoke_of
     <
@@ -1673,8 +1695,10 @@
 class __bind
     : public __weak_result_type<typename decay<_Fp>::type>
 {
+protected:
     typedef typename decay<_Fp>::type _Fd;
     typedef tuple<typename decay<_BoundArgs>::type...> _Td;
+private:
     _Fd __f_;
     _Td __bound_args_;
 
@@ -1731,7 +1755,7 @@
 
     template <class ..._Args>
         _LIBCPP_INLINE_VISIBILITY
-        typename __bind_return<_Fd, _Td, tuple<_Args&&...> >::type
+        typename __bind_return<const _Fd, const _Td, tuple<_Args&&...> >::type
         operator()(_Args&& ...__args) const
         {
             return __apply_functor(__f_, __bound_args_, __indices(),
@@ -1747,6 +1771,8 @@
     : public __bind<_Fp, _BoundArgs...>
 {
     typedef __bind<_Fp, _BoundArgs...> base;
+    typedef typename base::_Fd _Fd;
+    typedef typename base::_Td _Td;
 public:
     typedef _Rp result_type;
 
@@ -1784,7 +1810,12 @@
 
     template <class ..._Args>
         _LIBCPP_INLINE_VISIBILITY
-        result_type
+        typename enable_if
+        <
+            is_convertible<typename __bind_return<_Fd, _Td, tuple<_Args&&...> >::type,
+                           result_type>::value,
+            result_type
+        >::type
         operator()(_Args&& ...__args)
         {
             return base::operator()(_VSTD::forward<_Args>(__args)...);
@@ -1792,7 +1823,12 @@
 
     template <class ..._Args>
         _LIBCPP_INLINE_VISIBILITY
-        result_type
+        typename enable_if
+        <
+            is_convertible<typename __bind_return<const _Fd, const _Td, tuple<_Args&&...> >::type,
+                           result_type>::value,
+            result_type
+        >::type
         operator()(_Args&& ...__args) const
         {
             return base::operator()(_VSTD::forward<_Args>(__args)...);
@@ -1823,7 +1859,7 @@
 #endif  // _LIBCPP_HAS_NO_VARIADICS
 
 template <>
-struct _LIBCPP_VISIBLE hash<bool>
+struct _LIBCPP_TYPE_VIS hash<bool>
     : public unary_function<bool, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -1831,7 +1867,7 @@
 };
 
 template <>
-struct _LIBCPP_VISIBLE hash<char>
+struct _LIBCPP_TYPE_VIS hash<char>
     : public unary_function<char, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -1839,7 +1875,7 @@
 };
 
 template <>
-struct _LIBCPP_VISIBLE hash<signed char>
+struct _LIBCPP_TYPE_VIS hash<signed char>
     : public unary_function<signed char, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -1847,7 +1883,7 @@
 };
 
 template <>
-struct _LIBCPP_VISIBLE hash<unsigned char>
+struct _LIBCPP_TYPE_VIS hash<unsigned char>
     : public unary_function<unsigned char, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -1857,7 +1893,7 @@
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
 
 template <>
-struct _LIBCPP_VISIBLE hash<char16_t>
+struct _LIBCPP_TYPE_VIS hash<char16_t>
     : public unary_function<char16_t, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -1865,7 +1901,7 @@
 };
 
 template <>
-struct _LIBCPP_VISIBLE hash<char32_t>
+struct _LIBCPP_TYPE_VIS hash<char32_t>
     : public unary_function<char32_t, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -1875,7 +1911,7 @@
 #endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
 
 template <>
-struct _LIBCPP_VISIBLE hash<wchar_t>
+struct _LIBCPP_TYPE_VIS hash<wchar_t>
     : public unary_function<wchar_t, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -1883,7 +1919,7 @@
 };
 
 template <>
-struct _LIBCPP_VISIBLE hash<short>
+struct _LIBCPP_TYPE_VIS hash<short>
     : public unary_function<short, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -1891,7 +1927,7 @@
 };
 
 template <>
-struct _LIBCPP_VISIBLE hash<unsigned short>
+struct _LIBCPP_TYPE_VIS hash<unsigned short>
     : public unary_function<unsigned short, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -1899,7 +1935,7 @@
 };
 
 template <>
-struct _LIBCPP_VISIBLE hash<int>
+struct _LIBCPP_TYPE_VIS hash<int>
     : public unary_function<int, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -1907,7 +1943,7 @@
 };
 
 template <>
-struct _LIBCPP_VISIBLE hash<unsigned int>
+struct _LIBCPP_TYPE_VIS hash<unsigned int>
     : public unary_function<unsigned int, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -1915,7 +1951,7 @@
 };
 
 template <>
-struct _LIBCPP_VISIBLE hash<long>
+struct _LIBCPP_TYPE_VIS hash<long>
     : public unary_function<long, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -1923,7 +1959,7 @@
 };
 
 template <>
-struct _LIBCPP_VISIBLE hash<unsigned long>
+struct _LIBCPP_TYPE_VIS hash<unsigned long>
     : public unary_function<unsigned long, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -1931,19 +1967,19 @@
 };
 
 template <>
-struct _LIBCPP_VISIBLE hash<long long>
+struct _LIBCPP_TYPE_VIS hash<long long>
     : public __scalar_hash<long long>
 {
 };
 
 template <>
-struct _LIBCPP_VISIBLE hash<unsigned long long>
+struct _LIBCPP_TYPE_VIS hash<unsigned long long>
     : public __scalar_hash<unsigned long long>
 {
 };
 
 template <>
-struct _LIBCPP_VISIBLE hash<float>
+struct _LIBCPP_TYPE_VIS hash<float>
     : public __scalar_hash<float>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -1957,7 +1993,7 @@
 };
 
 template <>
-struct _LIBCPP_VISIBLE hash<double>
+struct _LIBCPP_TYPE_VIS hash<double>
     : public __scalar_hash<double>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -1971,7 +2007,7 @@
 };
 
 template <>
-struct _LIBCPP_VISIBLE hash<long double>
+struct _LIBCPP_TYPE_VIS hash<long double>
     : public __scalar_hash<long double>
 {
     _LIBCPP_INLINE_VISIBILITY
diff --git a/sources/cxx-stl/llvm-libc++/include/future b/sources/cxx-stl/llvm-libc++/libcxx/include/future
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/future
rename to sources/cxx-stl/llvm-libc++/libcxx/include/future
index f4e6fec..3d7bb6c 100644
--- a/sources/cxx-stl/llvm-libc++/include/future
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/future
@@ -387,11 +387,11 @@
 _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(future_errc)
 
 template <>
-struct _LIBCPP_VISIBLE is_error_code_enum<future_errc> : public true_type {};
+struct _LIBCPP_TYPE_VIS is_error_code_enum<future_errc> : public true_type {};
 
 #ifdef _LIBCPP_HAS_NO_STRONG_ENUMS
 template <>
-struct _LIBCPP_VISIBLE is_error_code_enum<future_errc::__lx> : public true_type { };
+struct _LIBCPP_TYPE_VIS is_error_code_enum<future_errc::__lx> : public true_type { };
 #endif
 
 //enum class launch
@@ -412,7 +412,7 @@
 };
 _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(future_status)
 
-_LIBCPP_VISIBLE
+_LIBCPP_FUNC_VIS
 const error_category& future_category() _NOEXCEPT;
 
 inline _LIBCPP_INLINE_VISIBILITY
@@ -966,12 +966,12 @@
     base::__on_zero_shared();
 }
 
-template <class _Rp> class _LIBCPP_VISIBLE promise;
-template <class _Rp> class _LIBCPP_VISIBLE shared_future;
+template <class _Rp> class _LIBCPP_TYPE_VIS promise;
+template <class _Rp> class _LIBCPP_TYPE_VIS shared_future;
 
 // future
 
-template <class _Rp> class _LIBCPP_VISIBLE future;
+template <class _Rp> class _LIBCPP_TYPE_VIS future;
 
 template <class _Rp, class _Fp>
 future<_Rp>
@@ -990,7 +990,7 @@
 #endif
 
 template <class _Rp>
-class _LIBCPP_VISIBLE future
+class _LIBCPP_TYPE_VIS future
 {
     __assoc_state<_Rp>* __state_;
 
@@ -1094,7 +1094,7 @@
 }
 
 template <class _Rp>
-class _LIBCPP_VISIBLE future<_Rp&>
+class _LIBCPP_TYPE_VIS future<_Rp&>
 {
     __assoc_state<_Rp&>* __state_;
 
@@ -1193,7 +1193,7 @@
 }
 
 template <>
-class _LIBCPP_VISIBLE future<void>
+class _LIBCPP_TYPE_VIS future<void>
 {
     __assoc_sub_state* __state_;
 
@@ -1275,7 +1275,7 @@
 template <class _Callable> class packaged_task;
 
 template <class _Rp>
-class _LIBCPP_VISIBLE promise
+class _LIBCPP_TYPE_VIS promise
 {
     __assoc_state<_Rp>* __state_;
 
@@ -1453,7 +1453,7 @@
 // promise<R&>
 
 template <class _Rp>
-class _LIBCPP_VISIBLE promise<_Rp&>
+class _LIBCPP_TYPE_VIS promise<_Rp&>
 {
     __assoc_state<_Rp&>* __state_;
 
@@ -1596,7 +1596,7 @@
 // promise<void>
 
 template <>
-class _LIBCPP_VISIBLE promise<void>
+class _LIBCPP_TYPE_VIS promise<void>
 {
     __assoc_sub_state* __state_;
 
@@ -1670,7 +1670,7 @@
 }
 
 template <class _Rp, class _Alloc>
-    struct _LIBCPP_VISIBLE uses_allocator<promise<_Rp>, _Alloc>
+    struct _LIBCPP_TYPE_VIS uses_allocator<promise<_Rp>, _Alloc>
         : public true_type {};
 
 #ifndef _LIBCPP_HAS_NO_VARIADICS
@@ -1757,7 +1757,7 @@
 class __packaged_task_function<_Rp(_ArgTypes...)>
 {
     typedef __packaged_task_base<_Rp(_ArgTypes...)> __base;
-    aligned_storage<3*sizeof(void*)>::type __buf_;
+    typename aligned_storage<3*sizeof(void*)>::type __buf_;
     __base* __f_;
 
 public:
@@ -1934,7 +1934,7 @@
 }
 
 template<class _Rp, class ..._ArgTypes>
-class _LIBCPP_VISIBLE packaged_task<_Rp(_ArgTypes...)>
+class _LIBCPP_TYPE_VIS packaged_task<_Rp(_ArgTypes...)>
 {
 public:
     typedef _Rp result_type;
@@ -2049,7 +2049,7 @@
 }
 
 template<class ..._ArgTypes>
-class _LIBCPP_VISIBLE packaged_task<void(_ArgTypes...)>
+class _LIBCPP_TYPE_VIS packaged_task<void(_ArgTypes...)>
 {
 public:
     typedef void result_type;
@@ -2174,7 +2174,7 @@
 }
 
 template <class _Callable, class _Alloc>
-struct _LIBCPP_VISIBLE uses_allocator<packaged_task<_Callable>, _Alloc>
+struct _LIBCPP_TYPE_VIS uses_allocator<packaged_task<_Callable>, _Alloc>
     : public true_type {};
 
 template <class _Rp, class _Fp>
@@ -2263,7 +2263,7 @@
 // shared_future
 
 template <class _Rp>
-class _LIBCPP_VISIBLE shared_future
+class _LIBCPP_TYPE_VIS shared_future
 {
     __assoc_state<_Rp>* __state_;
 
@@ -2337,7 +2337,7 @@
 }
 
 template <class _Rp>
-class _LIBCPP_VISIBLE shared_future<_Rp&>
+class _LIBCPP_TYPE_VIS shared_future<_Rp&>
 {
     __assoc_state<_Rp&>* __state_;
 
@@ -2411,7 +2411,7 @@
 }
 
 template <>
-class _LIBCPP_VISIBLE shared_future<void>
+class _LIBCPP_TYPE_VIS shared_future<void>
 {
     __assoc_sub_state* __state_;
 
diff --git a/sources/cxx-stl/llvm-libc++/include/initializer_list b/sources/cxx-stl/llvm-libc++/libcxx/include/initializer_list
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/initializer_list
rename to sources/cxx-stl/llvm-libc++/libcxx/include/initializer_list
index 2f88514..181313d 100644
--- a/sources/cxx-stl/llvm-libc++/include/initializer_list
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/initializer_list
@@ -56,7 +56,7 @@
 #ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
 
 template<class _Ep>
-class _LIBCPP_VISIBLE initializer_list
+class _LIBCPP_TYPE_VIS initializer_list
 {
     const _Ep* __begin_;
     size_t    __size_;
diff --git a/sources/cxx-stl/llvm-libc++/include/iomanip b/sources/cxx-stl/llvm-libc++/libcxx/include/iomanip
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/iomanip
rename to sources/cxx-stl/llvm-libc++/libcxx/include/iomanip
diff --git a/sources/cxx-stl/llvm-libc++/include/ios b/sources/cxx-stl/llvm-libc++/libcxx/include/ios
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/ios
rename to sources/cxx-stl/llvm-libc++/libcxx/include/ios
index 1474deb..25bbfc0 100644
--- a/sources/cxx-stl/llvm-libc++/include/ios
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/ios
@@ -224,10 +224,10 @@
 
 typedef ptrdiff_t streamsize;
 
-class _LIBCPP_VISIBLE ios_base
+class _LIBCPP_TYPE_VIS ios_base
 {
 public:
-    class _LIBCPP_VISIBLE failure;
+    class _LIBCPP_TYPE_VIS failure;
 
     typedef unsigned int fmtflags;
     static const fmtflags boolalpha   = 0x0001;
@@ -271,7 +271,7 @@
     typedef _VSTD::streamoff streamoff;
     typedef _VSTD::streampos streampos;
 
-    class _LIBCPP_VISIBLE Init;
+    class _LIBCPP_TYPE_VIS Init;
 
     // 27.5.2.2 fmtflags state:
     _LIBCPP_INLINE_VISIBILITY fmtflags flags() const;
@@ -380,14 +380,14 @@
 _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(io_errc)
 
 template <>
-struct _LIBCPP_VISIBLE is_error_code_enum<io_errc> : public true_type { };
+struct _LIBCPP_TYPE_VIS is_error_code_enum<io_errc> : public true_type { };
 
 #ifdef _LIBCPP_HAS_NO_STRONG_ENUMS
 template <>
-struct _LIBCPP_VISIBLE is_error_code_enum<io_errc::__lx> : public true_type { };
+struct _LIBCPP_TYPE_VIS is_error_code_enum<io_errc::__lx> : public true_type { };
 #endif
 
-_LIBCPP_VISIBLE
+_LIBCPP_FUNC_VIS
 const error_category& iostream_category();
 
 inline _LIBCPP_INLINE_VISIBILITY
@@ -413,7 +413,7 @@
     virtual ~failure() throw();
 };
 
-class _LIBCPP_VISIBLE ios_base::Init
+class _LIBCPP_TYPE_VIS ios_base::Init
 {
 public:
     Init();
@@ -560,7 +560,7 @@
 }
 
 template <class _CharT, class _Traits>
-class _LIBCPP_VISIBLE basic_ios
+class _LIBCPP_TYPE_VIS basic_ios
     : public ios_base
 {
 public:
diff --git a/sources/cxx-stl/llvm-libc++/include/iosfwd b/sources/cxx-stl/llvm-libc++/libcxx/include/iosfwd
similarity index 87%
rename from sources/cxx-stl/llvm-libc++/include/iosfwd
rename to sources/cxx-stl/llvm-libc++/libcxx/include/iosfwd
index efdff5f..849d7e5 100644
--- a/sources/cxx-stl/llvm-libc++/include/iosfwd
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/iosfwd
@@ -95,49 +95,49 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-class _LIBCPP_VISIBLE ios_base;
+class _LIBCPP_TYPE_VIS ios_base;
 
-template<class _CharT>  struct _LIBCPP_VISIBLE char_traits;
-template<class _Tp>     class _LIBCPP_VISIBLE allocator;
+template<class _CharT>  struct _LIBCPP_TYPE_VIS char_traits;
+template<class _Tp>     class _LIBCPP_TYPE_VIS allocator;
 
 template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_VISIBLE basic_ios;
+    class _LIBCPP_TYPE_VIS basic_ios;
 
 template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_VISIBLE basic_streambuf;
+    class _LIBCPP_TYPE_VIS basic_streambuf;
 template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_VISIBLE basic_istream;
+    class _LIBCPP_TYPE_VIS basic_istream;
 template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_VISIBLE basic_ostream;
+    class _LIBCPP_TYPE_VIS basic_ostream;
 template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_VISIBLE basic_iostream;
+    class _LIBCPP_TYPE_VIS basic_iostream;
 
 template <class _CharT, class _Traits = char_traits<_CharT>,
           class _Allocator = allocator<_CharT> >
-    class _LIBCPP_VISIBLE basic_stringbuf;
+    class _LIBCPP_TYPE_VIS basic_stringbuf;
 template <class _CharT, class _Traits = char_traits<_CharT>,
           class _Allocator = allocator<_CharT> >
-    class _LIBCPP_VISIBLE basic_istringstream;
+    class _LIBCPP_TYPE_VIS basic_istringstream;
 template <class _CharT, class _Traits = char_traits<_CharT>,
           class _Allocator = allocator<_CharT> >
-    class _LIBCPP_VISIBLE basic_ostringstream;
+    class _LIBCPP_TYPE_VIS basic_ostringstream;
 template <class _CharT, class _Traits = char_traits<_CharT>,
           class _Allocator = allocator<_CharT> >
-    class _LIBCPP_VISIBLE basic_stringstream;
+    class _LIBCPP_TYPE_VIS basic_stringstream;
 
 template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_VISIBLE basic_filebuf;
+    class _LIBCPP_TYPE_VIS basic_filebuf;
 template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_VISIBLE basic_ifstream;
+    class _LIBCPP_TYPE_VIS basic_ifstream;
 template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_VISIBLE basic_ofstream;
+    class _LIBCPP_TYPE_VIS basic_ofstream;
 template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_VISIBLE basic_fstream;
+    class _LIBCPP_TYPE_VIS basic_fstream;
 
 template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_VISIBLE istreambuf_iterator;
+    class _LIBCPP_TYPE_VIS istreambuf_iterator;
 template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_VISIBLE ostreambuf_iterator;
+    class _LIBCPP_TYPE_VIS ostreambuf_iterator;
 
 typedef basic_ios<char>              ios;
 typedef basic_ios<wchar_t>           wios;
@@ -172,7 +172,7 @@
 typedef basic_ofstream<wchar_t>      wofstream;
 typedef basic_fstream<wchar_t>       wfstream;
 
-template <class _State>             class _LIBCPP_VISIBLE fpos;
+template <class _State>             class _LIBCPP_TYPE_VIS fpos;
 typedef fpos<mbstate_t>    streampos;
 typedef fpos<mbstate_t>    wstreampos;
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
@@ -185,7 +185,7 @@
 template <class _CharT,             // for <stdexcept>
           class _Traits = char_traits<_CharT>,
           class _Allocator = allocator<_CharT> >
-    class _LIBCPP_VISIBLE basic_string;
+    class _LIBCPP_TYPE_VIS basic_string;
 typedef basic_string<char, char_traits<char>, allocator<char> > string;
 typedef basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t> > wstring;
 
diff --git a/sources/cxx-stl/llvm-libc++/include/iostream b/sources/cxx-stl/llvm-libc++/libcxx/include/iostream
similarity index 76%
rename from sources/cxx-stl/llvm-libc++/include/iostream
rename to sources/cxx-stl/llvm-libc++/libcxx/include/iostream
index 53cd146..ddf2484 100644
--- a/sources/cxx-stl/llvm-libc++/include/iostream
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/iostream
@@ -46,14 +46,14 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-extern _LIBCPP_VISIBLE istream cin;
-extern _LIBCPP_VISIBLE ostream cout;
-extern _LIBCPP_VISIBLE ostream cerr;
-extern _LIBCPP_VISIBLE ostream clog;
-extern _LIBCPP_VISIBLE wistream wcin;
-extern _LIBCPP_VISIBLE wostream wcout;
-extern _LIBCPP_VISIBLE wostream wcerr;
-extern _LIBCPP_VISIBLE wostream wclog;
+extern _LIBCPP_FUNC_VIS istream cin;
+extern _LIBCPP_FUNC_VIS ostream cout;
+extern _LIBCPP_FUNC_VIS ostream cerr;
+extern _LIBCPP_FUNC_VIS ostream clog;
+extern _LIBCPP_FUNC_VIS wistream wcin;
+extern _LIBCPP_FUNC_VIS wostream wcout;
+extern _LIBCPP_FUNC_VIS wostream wcerr;
+extern _LIBCPP_FUNC_VIS wostream wclog;
 
 _LIBCPP_END_NAMESPACE_STD
 
diff --git a/sources/cxx-stl/llvm-libc++/include/istream b/sources/cxx-stl/llvm-libc++/libcxx/include/istream
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/istream
rename to sources/cxx-stl/llvm-libc++/libcxx/include/istream
index 3979e14..3f629f6 100644
--- a/sources/cxx-stl/llvm-libc++/include/istream
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/istream
@@ -164,7 +164,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 template <class _CharT, class _Traits>
-class _LIBCPP_VISIBLE basic_istream
+class _LIBCPP_TYPE_VIS basic_istream
     : virtual public basic_ios<_CharT, _Traits>
 {
     streamsize __gc_;
@@ -194,7 +194,7 @@
 public:
 
     // 27.7.1.1.3 Prefix/suffix:
-    class _LIBCPP_VISIBLE sentry;
+    class _LIBCPP_TYPE_VIS sentry;
 
     // 27.7.1.2 Formatted input:
     basic_istream& operator>>(basic_istream& (*__pf)(basic_istream&));
@@ -244,7 +244,7 @@
 };
 
 template <class _CharT, class _Traits>
-class _LIBCPP_VISIBLE basic_istream<_CharT, _Traits>::sentry
+class _LIBCPP_TYPE_VIS basic_istream<_CharT, _Traits>::sentry
 {
     bool __ok_;
 
@@ -1216,16 +1216,9 @@
         sentry __sen(*this, true);
         if (__sen)
         {
-            for (; __gc_ < __n; ++__gc_)
-            {
-                typename traits_type::int_type __i = this->rdbuf()->sbumpc();
-                if (traits_type::eq_int_type(__i, traits_type::eof()))
-                {
-                   this->setstate(ios_base::failbit | ios_base::eofbit);
-                   break;
-                }
-                *__s++ = traits_type::to_char_type(__i);
-            }
+            __gc_ = this->rdbuf()->sgetn(__s, __n);
+            if (__gc_ != __n)
+                this->setstate(ios_base::failbit | ios_base::eofbit);
         }
         else
             this->setstate(ios_base::failbit);
@@ -1460,7 +1453,7 @@
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
 template <class _CharT, class _Traits>
-class _LIBCPP_VISIBLE basic_iostream
+class _LIBCPP_TYPE_VIS basic_iostream
     : public basic_istream<_CharT, _Traits>,
       public basic_ostream<_CharT, _Traits>
 {
diff --git a/sources/cxx-stl/llvm-libc++/include/iterator b/sources/cxx-stl/llvm-libc++/libcxx/include/iterator
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/iterator
rename to sources/cxx-stl/llvm-libc++/libcxx/include/iterator
index b23310b..3b078a2 100644
--- a/sources/cxx-stl/llvm-libc++/include/iterator
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/iterator
@@ -317,7 +317,7 @@
 #include <type_traits>
 #include <cstddef>
 #include <iosfwd>
-#if __APPLE__
+#ifdef __APPLE__
 #include <Availability.h>
 #endif
 
@@ -331,11 +331,11 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-struct _LIBCPP_VISIBLE input_iterator_tag {};
-struct _LIBCPP_VISIBLE output_iterator_tag {};
-struct _LIBCPP_VISIBLE forward_iterator_tag       : public input_iterator_tag {};
-struct _LIBCPP_VISIBLE bidirectional_iterator_tag : public forward_iterator_tag {};
-struct _LIBCPP_VISIBLE random_access_iterator_tag : public bidirectional_iterator_tag {};
+struct _LIBCPP_TYPE_VIS input_iterator_tag {};
+struct _LIBCPP_TYPE_VIS output_iterator_tag {};
+struct _LIBCPP_TYPE_VIS forward_iterator_tag       : public input_iterator_tag {};
+struct _LIBCPP_TYPE_VIS bidirectional_iterator_tag : public forward_iterator_tag {};
+struct _LIBCPP_TYPE_VIS random_access_iterator_tag : public bidirectional_iterator_tag {};
 
 template <class _Tp>
 struct __has_iterator_category
@@ -378,11 +378,11 @@
 //    the client expects instead of failing at compile time.
 
 template <class _Iter>
-struct _LIBCPP_VISIBLE iterator_traits
+struct _LIBCPP_TYPE_VIS iterator_traits
     : __iterator_traits<_Iter, __has_iterator_category<_Iter>::value> {};
 
 template<class _Tp>
-struct _LIBCPP_VISIBLE iterator_traits<_Tp*>
+struct _LIBCPP_TYPE_VIS iterator_traits<_Tp*>
 {
     typedef ptrdiff_t difference_type;
     typedef typename remove_const<_Tp>::type value_type;
@@ -413,7 +413,7 @@
 
 template<class _Category, class _Tp, class _Distance = ptrdiff_t,
          class _Pointer = _Tp*, class _Reference = _Tp&>
-struct _LIBCPP_VISIBLE iterator
+struct _LIBCPP_TYPE_VIS iterator
 {
     typedef _Tp        value_type;
     typedef _Distance  difference_type;
@@ -510,7 +510,7 @@
 }
 
 template <class _Iter>
-class _LIBCPP_VISIBLE reverse_iterator
+class _LIBCPP_TYPE_VIS reverse_iterator
     : public iterator<typename iterator_traits<_Iter>::iterator_category,
                       typename iterator_traits<_Iter>::value_type,
                       typename iterator_traits<_Iter>::difference_type,
@@ -617,7 +617,7 @@
 }
 
 template <class _Container>
-class _LIBCPP_VISIBLE back_insert_iterator
+class _LIBCPP_TYPE_VIS back_insert_iterator
     : public iterator<output_iterator_tag,
                       void,
                       void,
@@ -650,7 +650,7 @@
 }
 
 template <class _Container>
-class _LIBCPP_VISIBLE front_insert_iterator
+class _LIBCPP_TYPE_VIS front_insert_iterator
     : public iterator<output_iterator_tag,
                       void,
                       void,
@@ -683,7 +683,7 @@
 }
 
 template <class _Container>
-class _LIBCPP_VISIBLE insert_iterator
+class _LIBCPP_TYPE_VIS insert_iterator
     : public iterator<output_iterator_tag,
                       void,
                       void,
@@ -719,7 +719,7 @@
 
 template <class _Tp, class _CharT = char,
           class _Traits = char_traits<_CharT>, class _Distance = ptrdiff_t>
-class _LIBCPP_VISIBLE istream_iterator
+class _LIBCPP_TYPE_VIS istream_iterator
     : public iterator<input_iterator_tag, _Tp, _Distance, const _Tp*, const _Tp&>
 {
 public:
@@ -758,7 +758,7 @@
 };
 
 template <class _Tp, class _CharT = char, class _Traits = char_traits<_CharT> >
-class _LIBCPP_VISIBLE ostream_iterator
+class _LIBCPP_TYPE_VIS ostream_iterator
     : public iterator<output_iterator_tag, void, void, void, void>
 {
 public:
@@ -787,7 +787,7 @@
 };
 
 template<class _CharT, class _Traits>
-class _LIBCPP_VISIBLE istreambuf_iterator
+class _LIBCPP_TYPE_VIS istreambuf_iterator
     : public iterator<input_iterator_tag, _CharT,
                       typename _Traits::off_type, _CharT*,
                       _CharT>
@@ -858,7 +858,7 @@
                 {return !__a.equal(__b);}
 
 template <class _CharT, class _Traits>
-class _LIBCPP_VISIBLE ostreambuf_iterator
+class _LIBCPP_TYPE_VIS ostreambuf_iterator
     : public iterator<output_iterator_tag, void, void, void, void>
 {
 public:
@@ -899,7 +899,7 @@
 };
 
 template <class _Iter>
-class _LIBCPP_VISIBLE move_iterator
+class _LIBCPP_TYPE_VIS move_iterator
 {
 private:
     _Iter __i;
diff --git a/sources/cxx-stl/llvm-libc++/include/limits b/sources/cxx-stl/llvm-libc++/libcxx/include/limits
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/include/limits
rename to sources/cxx-stl/llvm-libc++/libcxx/include/limits
index f089a79..9b9d7a6 100644
--- a/sources/cxx-stl/llvm-libc++/include/limits
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/limits
@@ -433,7 +433,7 @@
 };
 
 template <class _Tp>
-class _LIBCPP_VISIBLE numeric_limits
+class _LIBCPP_TYPE_VIS numeric_limits
     : private __libcpp_numeric_limits<typename remove_cv<_Tp>::type>
 {
     typedef __libcpp_numeric_limits<typename remove_cv<_Tp>::type> __base;
@@ -526,7 +526,7 @@
     _LIBCPP_CONSTEXPR const float_round_style numeric_limits<_Tp>::round_style;
 
 template <class _Tp>
-class _LIBCPP_VISIBLE numeric_limits<const _Tp>
+class _LIBCPP_TYPE_VIS numeric_limits<const _Tp>
     : private numeric_limits<_Tp>
 {
     typedef numeric_limits<_Tp> __base;
@@ -619,7 +619,7 @@
     _LIBCPP_CONSTEXPR const float_round_style numeric_limits<const _Tp>::round_style;
 
 template <class _Tp>
-class _LIBCPP_VISIBLE numeric_limits<volatile _Tp>
+class _LIBCPP_TYPE_VIS numeric_limits<volatile _Tp>
     : private numeric_limits<_Tp>
 {
     typedef numeric_limits<_Tp> __base;
@@ -712,7 +712,7 @@
     _LIBCPP_CONSTEXPR const float_round_style numeric_limits<volatile _Tp>::round_style;
 
 template <class _Tp>
-class _LIBCPP_VISIBLE numeric_limits<const volatile _Tp>
+class _LIBCPP_TYPE_VIS numeric_limits<const volatile _Tp>
     : private numeric_limits<_Tp>
 {
     typedef numeric_limits<_Tp> __base;
diff --git a/sources/cxx-stl/llvm-libc++/include/list b/sources/cxx-stl/llvm-libc++/libcxx/include/list
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/list
rename to sources/cxx-stl/llvm-libc++/libcxx/include/list
index 8125886..c6000c9 100644
--- a/sources/cxx-stl/llvm-libc++/include/list
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/list
@@ -213,12 +213,12 @@
     _Tp __value_;
 };
 
-template <class _Tp, class _Alloc> class _LIBCPP_VISIBLE list;
+template <class _Tp, class _Alloc> class _LIBCPP_TYPE_VIS list;
 template <class _Tp, class _Alloc> class __list_imp;
-template <class _Tp, class _VoidPtr> class _LIBCPP_VISIBLE __list_const_iterator;
+template <class _Tp, class _VoidPtr> class _LIBCPP_TYPE_VIS __list_const_iterator;
 
 template <class _Tp, class _VoidPtr>
-class _LIBCPP_VISIBLE __list_iterator
+class _LIBCPP_TYPE_VIS __list_iterator
 {
     typedef typename pointer_traits<_VoidPtr>::template
 #ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
@@ -348,7 +348,7 @@
 };
 
 template <class _Tp, class _VoidPtr>
-class _LIBCPP_VISIBLE __list_const_iterator
+class _LIBCPP_TYPE_VIS __list_const_iterator
 {
     typedef typename pointer_traits<_VoidPtr>::template
 #ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
@@ -394,7 +394,7 @@
 #endif
     }
     _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator(__list_iterator<_Tp, _VoidPtr> __p) _NOEXCEPT
+    __list_const_iterator(const __list_iterator<_Tp, _VoidPtr>& __p) _NOEXCEPT
         : __ptr_(__p.__ptr_)
     {
 #if _LIBCPP_DEBUG_LEVEL >= 2
@@ -767,7 +767,7 @@
 }
 
 template <class _Tp, class _Alloc = allocator<_Tp> >
-class _LIBCPP_VISIBLE list
+class _LIBCPP_TYPE_VIS list
     : private __list_imp<_Tp, _Alloc>
 {
     typedef __list_imp<_Tp, _Alloc> base;
@@ -1292,7 +1292,11 @@
     __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), __x);
     __link_nodes(const_cast<__node&>(*__p.__ptr_), *__hold, *__hold);
     ++base::__sz();
+#if _LIBCPP_DEBUG_LEVEL >= 2
+    return iterator(__hold.release(), this);
+#else
     return iterator(__hold.release());
+#endif
 }
 
 template <class _Tp, class _Alloc>
@@ -1518,6 +1522,11 @@
 typename list<_Tp, _Alloc>::iterator
 list<_Tp, _Alloc>::emplace(const_iterator __p, _Args&&... __args)
 {
+#if _LIBCPP_DEBUG_LEVEL >= 2
+    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
+        "list::emplace(iterator, args...) called with an iterator not"
+        " referring to this list");
+#endif
     __node_allocator& __na = base::__node_alloc();
     typedef __allocator_destructor<__node_allocator> _Dp;
     unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
@@ -1624,6 +1633,8 @@
         "list::erase(iterator) called with an iterator not"
         " referring to this list");
 #endif
+    _LIBCPP_ASSERT(__p != end(),
+        "list::erase(iterator) called with a non-dereferenceable iterator");
     __node_allocator& __na = base::__node_alloc();
     __node& __n = const_cast<__node&>(*__p.__ptr_);
     __node_pointer __r = __n.__next_;
diff --git a/sources/cxx-stl/llvm-libc++/include/locale b/sources/cxx-stl/llvm-libc++/libcxx/include/locale
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/include/locale
rename to sources/cxx-stl/llvm-libc++/libcxx/include/locale
index cf213bb..49f9c08 100644
--- a/sources/cxx-stl/llvm-libc++/include/locale
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/locale
@@ -181,18 +181,18 @@
 #include <streambuf>
 #include <iterator>
 #include <limits>
-#if !__APPLE__
+#ifndef __APPLE__
 #include <cstdarg>
 #endif
 #include <cstdlib>
 #include <ctime>
-#if _WIN32
+#ifdef _WIN32
 #include <support/win32/locale_win32.h>
 #else // _WIN32
 #include <nl_types.h>
 #endif  // !_WIN32
 
-#if __APPLE__
+#ifdef __APPLE__
 #include <Availability.h>
 #endif
 
@@ -204,7 +204,7 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-#if __APPLE__ || __FreeBSD__
+#if defined(__APPLE__) || defined(__FreeBSD__)
 #  define _LIBCPP_GET_C_LOCALE 0
 #else
 #  define _LIBCPP_GET_C_LOCALE __cloc()
@@ -222,7 +222,7 @@
 // OSX has nice foo_l() functions that let you turn off use of the global
 // locale.  Linux, not so much.  The following functions avoid the locale when
 // that's possible and otherwise do the wrong thing.  FIXME.
-#ifdef __linux__
+#if defined(__linux__) || defined(EMSCRIPTEN)
 
 #ifdef _LIBCPP_LOCALE__L_EXTENSIONS
 decltype(MB_CUR_MAX_L(_VSTD::declval<locale_t>()))
@@ -634,8 +634,7 @@
         }
         return -1;
     }
-    if (__a_end-__a < __num_get_buf_sz - 1)
-        *__a_end++ = __src[__f];
+    *__a_end++ = __src[__f];
     ++__dc;
     return 0;
 }
@@ -673,23 +672,26 @@
     char __x = __src[__f];
     if (__x == '-' || __x == '+')
     {
-        if (__a_end == __a || (__a_end[-1] & 0xDF) == __exp)
+        if (__a_end == __a || (__a_end[-1] & 0x5F) == (__exp & 0x7F))
         {
             *__a_end++ = __x;
             return 0;
         }
         return -1;
     }
-    if (__a_end-__a < __num_get_buf_sz - 1)
-        *__a_end++ = __x;
     if (__x == 'x' || __x == 'X')
         __exp = 'P';
-    else if ((__x & 0xDF) == __exp)
+    else if ((__x & 0x5F) == __exp)
     {
-        __in_units = false;
-        if (__grouping.size() != 0 && __g_end-__g < __num_get_buf_sz)
-            *__g_end++ = __dc;
+        __exp |= 0x80;
+        if (__in_units)
+        {
+            __in_units = false;
+            if (__grouping.size() != 0 && __g_end-__g < __num_get_buf_sz)
+                *__g_end++ = __dc;
+        }
     }
+    *__a_end++ = __x;
     if (__f >= 22)
         return 0;
     ++__dc;
@@ -700,7 +702,7 @@
 _LIBCPP_EXTERN_TEMPLATE(struct __num_get<wchar_t>)
 
 template <class _CharT, class _InputIterator = istreambuf_iterator<_CharT> >
-class _LIBCPP_VISIBLE num_get
+class _LIBCPP_TYPE_VIS num_get
     : public locale::facet,
       private __num_get<_CharT>
 {
@@ -830,11 +832,11 @@
 {
     if (__a != __a_end)
     {
-        int __save_errno = errno;
+        typename remove_reference<decltype(errno)>::type __save_errno = errno;
         errno = 0;
         char *__p2;
         long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);
-        int __current_errno = errno;
+        typename remove_reference<decltype(errno)>::type __current_errno = errno;
         if (__current_errno == 0)
             errno = __save_errno;
         if (__p2 != __a_end)
@@ -870,11 +872,11 @@
             __err = ios_base::failbit;
             return 0;
         }
-        int __save_errno = errno;
+        typename remove_reference<decltype(errno)>::type __save_errno = errno;
         errno = 0;
         char *__p2;
         unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);
-        int __current_errno = errno;
+        typename remove_reference<decltype(errno)>::type __current_errno = errno;
         if (__current_errno == 0)
             errno = __save_errno;
         if (__p2 != __a_end)
@@ -900,13 +902,20 @@
 {
     if (__a != __a_end)
     {
+        typename remove_reference<decltype(errno)>::type __save_errno = errno;
+        errno = 0;
         char *__p2;
         long double __ld = strtold_l(__a, &__p2, _LIBCPP_GET_C_LOCALE);
+        typename remove_reference<decltype(errno)>::type __current_errno = errno;
+        if (__current_errno == 0)
+            errno = __save_errno;
         if (__p2 != __a_end)
         {
             __err = ios_base::failbit;
             return 0;
         }
+        else if (__current_errno == ERANGE)
+            __err = ios_base::failbit;
         return static_cast<_Tp>(__ld);
     }
     __err = ios_base::failbit;
@@ -962,16 +971,28 @@
     char_type __atoms[26];
     char_type __thousands_sep;
     string __grouping = this->__stage2_int_prep(__iob, __atoms, __thousands_sep);
-    char __a[__num_get_base::__num_get_buf_sz] = {0};
+    string __buf;
+    __buf.resize(__buf.capacity());
+    char* __a = &__buf[0];
     char* __a_end = __a;
     unsigned __g[__num_get_base::__num_get_buf_sz];
     unsigned* __g_end = __g;
     unsigned __dc = 0;
     for (; __b != __e; ++__b)
+    {
+        if (__a_end - __a == __buf.size())
+        {
+            size_t __tmp = __buf.size();
+            __buf.resize(2*__buf.size());
+            __buf.resize(__buf.capacity());
+            __a = &__buf[0];
+            __a_end = __a + __tmp;
+        }
         if (this->__stage2_int_loop(*__b, __base, __a, __a_end, __dc,
                                     __thousands_sep, __grouping, __g, __g_end,
                                     __atoms))
             break;
+    }
     if (__grouping.size() != 0 && __g_end-__g < __num_get_base::__num_get_buf_sz)
         *__g_end++ = __dc;
     // Stage 3
@@ -997,16 +1018,28 @@
     char_type __atoms[26];
     char_type __thousands_sep;
     string __grouping = this->__stage2_int_prep(__iob, __atoms, __thousands_sep);
-    char __a[__num_get_base::__num_get_buf_sz] = {0};
+    string __buf;
+    __buf.resize(__buf.capacity());
+    char* __a = &__buf[0];
     char* __a_end = __a;
     unsigned __g[__num_get_base::__num_get_buf_sz];
     unsigned* __g_end = __g;
     unsigned __dc = 0;
     for (; __b != __e; ++__b)
+    {
+        if (__a_end - __a == __buf.size())
+        {
+            size_t __tmp = __buf.size();
+            __buf.resize(2*__buf.size());
+            __buf.resize(__buf.capacity());
+            __a = &__buf[0];
+            __a_end = __a + __tmp;
+        }
         if (this->__stage2_int_loop(*__b, __base, __a, __a_end, __dc,
                                     __thousands_sep, __grouping, __g, __g_end,
                                     __atoms))
             break;
+    }
     if (__grouping.size() != 0 && __g_end-__g < __num_get_base::__num_get_buf_sz)
         *__g_end++ = __dc;
     // Stage 3
@@ -1032,16 +1065,28 @@
     char_type __atoms[26];
     char_type __thousands_sep;
     string __grouping = this->__stage2_int_prep(__iob, __atoms, __thousands_sep);
-    char __a[__num_get_base::__num_get_buf_sz] = {0};
+    string __buf;
+    __buf.resize(__buf.capacity());
+    char* __a = &__buf[0];
     char* __a_end = __a;
     unsigned __g[__num_get_base::__num_get_buf_sz];
     unsigned* __g_end = __g;
     unsigned __dc = 0;
     for (; __b != __e; ++__b)
+    {
+        if (__a_end - __a == __buf.size())
+        {
+            size_t __tmp = __buf.size();
+            __buf.resize(2*__buf.size());
+            __buf.resize(__buf.capacity());
+            __a = &__buf[0];
+            __a_end = __a + __tmp;
+        }
         if (this->__stage2_int_loop(*__b, __base, __a, __a_end, __dc,
                                     __thousands_sep, __grouping, __g, __g_end,
                                     __atoms))
             break;
+    }
     if (__grouping.size() != 0 && __g_end-__g < __num_get_base::__num_get_buf_sz)
         *__g_end++ = __dc;
     // Stage 3
@@ -1067,16 +1112,28 @@
     char_type __atoms[26];
     char_type __thousands_sep;
     string __grouping = this->__stage2_int_prep(__iob, __atoms, __thousands_sep);
-    char __a[__num_get_base::__num_get_buf_sz] = {0};
+    string __buf;
+    __buf.resize(__buf.capacity());
+    char* __a = &__buf[0];
     char* __a_end = __a;
     unsigned __g[__num_get_base::__num_get_buf_sz];
     unsigned* __g_end = __g;
     unsigned __dc = 0;
     for (; __b != __e; ++__b)
+    {
+        if (__a_end - __a == __buf.size())
+        {
+            size_t __tmp = __buf.size();
+            __buf.resize(2*__buf.size());
+            __buf.resize(__buf.capacity());
+            __a = &__buf[0];
+            __a_end = __a + __tmp;
+        }
         if (this->__stage2_int_loop(*__b, __base, __a, __a_end, __dc,
                                     __thousands_sep, __grouping, __g, __g_end,
                                     __atoms))
             break;
+    }
     if (__grouping.size() != 0 && __g_end-__g < __num_get_base::__num_get_buf_sz)
         *__g_end++ = __dc;
     // Stage 3
@@ -1102,16 +1159,28 @@
     char_type __atoms[26];
     char_type __thousands_sep;
     string __grouping = this->__stage2_int_prep(__iob, __atoms, __thousands_sep);
-    char __a[__num_get_base::__num_get_buf_sz] = {0};
+    string __buf;
+    __buf.resize(__buf.capacity());
+    char* __a = &__buf[0];
     char* __a_end = __a;
     unsigned __g[__num_get_base::__num_get_buf_sz];
     unsigned* __g_end = __g;
     unsigned __dc = 0;
     for (; __b != __e; ++__b)
+    {
+        if (__a_end - __a == __buf.size())
+        {
+            size_t __tmp = __buf.size();
+            __buf.resize(2*__buf.size());
+            __buf.resize(__buf.capacity());
+            __a = &__buf[0];
+            __a_end = __a + __tmp;
+        }
         if (this->__stage2_int_loop(*__b, __base, __a, __a_end, __dc,
                                     __thousands_sep, __grouping, __g, __g_end,
                                     __atoms))
             break;
+    }
     if (__grouping.size() != 0 && __g_end-__g < __num_get_base::__num_get_buf_sz)
         *__g_end++ = __dc;
     // Stage 3
@@ -1137,16 +1206,28 @@
     char_type __atoms[26];
     char_type __thousands_sep;
     string __grouping = this->__stage2_int_prep(__iob, __atoms, __thousands_sep);
-    char __a[__num_get_base::__num_get_buf_sz] = {0};
+    string __buf;
+    __buf.resize(__buf.capacity());
+    char* __a = &__buf[0];
     char* __a_end = __a;
     unsigned __g[__num_get_base::__num_get_buf_sz];
     unsigned* __g_end = __g;
     unsigned __dc = 0;
     for (; __b != __e; ++__b)
+    {
+        if (__a_end - __a == __buf.size())
+        {
+            size_t __tmp = __buf.size();
+            __buf.resize(2*__buf.size());
+            __buf.resize(__buf.capacity());
+            __a = &__buf[0];
+            __a_end = __a + __tmp;
+        }
         if (this->__stage2_int_loop(*__b, __base, __a, __a_end, __dc,
                                     __thousands_sep, __grouping, __g, __g_end,
                                     __atoms))
             break;
+    }
     if (__grouping.size() != 0 && __g_end-__g < __num_get_base::__num_get_buf_sz)
         *__g_end++ = __dc;
     // Stage 3
@@ -1174,7 +1255,9 @@
     string __grouping = this->__stage2_float_prep(__iob, __atoms,
                                                   __decimal_point,
                                                   __thousands_sep);
-    char __a[__num_get_base::__num_get_buf_sz] = {0};
+    string __buf;
+    __buf.resize(__buf.capacity());
+    char* __a = &__buf[0];
     char* __a_end = __a;
     unsigned __g[__num_get_base::__num_get_buf_sz];
     unsigned* __g_end = __g;
@@ -1182,11 +1265,21 @@
     bool __in_units = true;
     char __exp = 'E';
     for (; __b != __e; ++__b)
+    {
+        if (__a_end - __a == __buf.size())
+        {
+            size_t __tmp = __buf.size();
+            __buf.resize(2*__buf.size());
+            __buf.resize(__buf.capacity());
+            __a = &__buf[0];
+            __a_end = __a + __tmp;
+        }
         if (this->__stage2_float_loop(*__b, __in_units, __exp, __a, __a_end,
                                       __decimal_point, __thousands_sep,
                                       __grouping, __g, __g_end,
                                       __dc, __atoms))
             break;
+    }
     if (__grouping.size() != 0 && __in_units && __g_end-__g < __num_get_base::__num_get_buf_sz)
         *__g_end++ = __dc;
     // Stage 3
@@ -1214,7 +1307,9 @@
     string __grouping = this->__stage2_float_prep(__iob, __atoms,
                                                   __decimal_point,
                                                   __thousands_sep);
-    char __a[__num_get_base::__num_get_buf_sz] = {0};
+    string __buf;
+    __buf.resize(__buf.capacity());
+    char* __a = &__buf[0];
     char* __a_end = __a;
     unsigned __g[__num_get_base::__num_get_buf_sz];
     unsigned* __g_end = __g;
@@ -1222,11 +1317,21 @@
     bool __in_units = true;
     char __exp = 'E';
     for (; __b != __e; ++__b)
+    {
+        if (__a_end - __a == __buf.size())
+        {
+            size_t __tmp = __buf.size();
+            __buf.resize(2*__buf.size());
+            __buf.resize(__buf.capacity());
+            __a = &__buf[0];
+            __a_end = __a + __tmp;
+        }
         if (this->__stage2_float_loop(*__b, __in_units, __exp, __a, __a_end,
                                       __decimal_point, __thousands_sep,
                                       __grouping, __g, __g_end,
                                       __dc, __atoms))
             break;
+    }
     if (__grouping.size() != 0 && __in_units && __g_end-__g < __num_get_base::__num_get_buf_sz)
         *__g_end++ = __dc;
     // Stage 3
@@ -1254,7 +1359,9 @@
     string __grouping = this->__stage2_float_prep(__iob, __atoms,
                                                   __decimal_point,
                                                   __thousands_sep);
-    char __a[__num_get_base::__num_get_buf_sz] = {0};
+    string __buf;
+    __buf.resize(__buf.capacity());
+    char* __a = &__buf[0];
     char* __a_end = __a;
     unsigned __g[__num_get_base::__num_get_buf_sz];
     unsigned* __g_end = __g;
@@ -1262,11 +1369,21 @@
     bool __in_units = true;
     char __exp = 'E';
     for (; __b != __e; ++__b)
+    {
+        if (__a_end - __a == __buf.size())
+        {
+            size_t __tmp = __buf.size();
+            __buf.resize(2*__buf.size());
+            __buf.resize(__buf.capacity());
+            __a = &__buf[0];
+            __a_end = __a + __tmp;
+        }
         if (this->__stage2_float_loop(*__b, __in_units, __exp, __a, __a_end,
                                       __decimal_point, __thousands_sep,
                                       __grouping, __g, __g_end,
                                       __dc, __atoms))
             break;
+    }
     if (__grouping.size() != 0 && __in_units && __g_end-__g < __num_get_base::__num_get_buf_sz)
         *__g_end++ = __dc;
     // Stage 3
@@ -1294,16 +1411,28 @@
     string __grouping;
     use_facet<ctype<_CharT> >(__iob.getloc()).widen(__num_get_base::__src,
                                                     __num_get_base::__src + 26, __atoms);
-    char __a[__num_get_base::__num_get_buf_sz] = {0};
+    string __buf;
+    __buf.resize(__buf.capacity());
+    char* __a = &__buf[0];
     char* __a_end = __a;
     unsigned __g[__num_get_base::__num_get_buf_sz];
     unsigned* __g_end = __g;
     unsigned __dc = 0;
     for (; __b != __e; ++__b)
+    {
+        if (__a_end - __a == __buf.size())
+        {
+            size_t __tmp = __buf.size();
+            __buf.resize(2*__buf.size());
+            __buf.resize(__buf.capacity());
+            __a = &__buf[0];
+            __a_end = __a + __tmp;
+        }
         if (this->__stage2_int_loop(*__b, __base, __a, __a_end, __dc,
                                     __thousands_sep, __grouping,
                                     __g, __g_end, __atoms))
             break;
+    }
     // Stage 3
     __a[sizeof(__a)-1] = 0;
 #ifdef _LIBCPP_LOCALE__L_EXTENSIONS
@@ -1472,7 +1601,7 @@
 _LIBCPP_EXTERN_TEMPLATE(struct __num_put<wchar_t>)
 
 template <class _CharT, class _OutputIterator = ostreambuf_iterator<_CharT> >
-class _LIBCPP_VISIBLE num_put
+class _LIBCPP_TYPE_VIS num_put
     : public locale::facet,
       private __num_put<_CharT>
 {
@@ -1984,7 +2113,7 @@
     return __r;
 }
 
-class _LIBCPP_VISIBLE time_base
+class _LIBCPP_TYPE_VIS time_base
 {
 public:
     enum dateorder {no_order, dmy, mdy, ymd, ydm};
@@ -2006,7 +2135,7 @@
 };
 
 template <class _CharT, class _InputIterator = istreambuf_iterator<_CharT> >
-class _LIBCPP_VISIBLE time_get
+class _LIBCPP_TYPE_VIS time_get
     : public locale::facet,
       public time_base,
       private __time_get_c_storage<_CharT>
@@ -2656,7 +2785,7 @@
 };
 
 template <class _CharT, class _InputIterator = istreambuf_iterator<_CharT> >
-class _LIBCPP_VISIBLE time_get_byname
+class _LIBCPP_TYPE_VIS time_get_byname
     : public time_get<_CharT, _InputIterator>,
       private __time_get_storage<_CharT>
 {
@@ -2716,7 +2845,7 @@
 };
 
 template <class _CharT, class _OutputIterator = ostreambuf_iterator<_CharT> >
-class _LIBCPP_VISIBLE time_put
+class _LIBCPP_TYPE_VIS time_put
     : public locale::facet,
       private __time_put
 {
@@ -2815,7 +2944,7 @@
 _LIBCPP_EXTERN_TEMPLATE(class time_put<wchar_t>)
 
 template <class _CharT, class _OutputIterator = ostreambuf_iterator<_CharT> >
-class _LIBCPP_VISIBLE time_put_byname
+class _LIBCPP_TYPE_VIS time_put_byname
     : public time_put<_CharT, _OutputIterator>
 {
 public:
@@ -2837,7 +2966,7 @@
 
 // money_base
 
-class _LIBCPP_VISIBLE money_base
+class _LIBCPP_TYPE_VIS money_base
 {
 public:
     enum part {none, space, symbol, sign, value};
@@ -2849,7 +2978,7 @@
 // moneypunct
 
 template <class _CharT, bool _International = false>
-class _LIBCPP_VISIBLE moneypunct
+class _LIBCPP_TYPE_VIS moneypunct
     : public locale::facet,
       public money_base
 {
@@ -2907,7 +3036,7 @@
 // moneypunct_byname
 
 template <class _CharT, bool _International = false>
-class _LIBCPP_VISIBLE moneypunct_byname
+class _LIBCPP_TYPE_VIS moneypunct_byname
     : public moneypunct<_CharT, _International>
 {
 public:
@@ -3019,7 +3148,7 @@
 _LIBCPP_EXTERN_TEMPLATE(class __money_get<wchar_t>)
 
 template <class _CharT, class _InputIterator = istreambuf_iterator<_CharT> >
-class _LIBCPP_VISIBLE money_get
+class _LIBCPP_TYPE_VIS money_get
     : public locale::facet,
       private __money_get<_CharT>
 {
@@ -3353,7 +3482,7 @@
         if (__neg)
             *__nc++ = '-';
         for (const char_type* __w = __wb.get(); __w < __wn; ++__w, ++__nc)
-            *__nc = __src[find(__atoms, __atoms+sizeof(__atoms), *__w) - __atoms];
+            *__nc = __src[find(__atoms, _VSTD::end(__atoms), *__w) - __atoms];
         *__nc = char();
         if (sscanf(__nbuf, "%Lf", &__v) != 1)
             __throw_runtime_error("money_get error");
@@ -3575,7 +3704,7 @@
 _LIBCPP_EXTERN_TEMPLATE(class __money_put<wchar_t>)
 
 template <class _CharT, class _OutputIterator = ostreambuf_iterator<_CharT> >
-class _LIBCPP_VISIBLE money_put
+class _LIBCPP_TYPE_VIS money_put
     : public locale::facet,
       private __money_put<_CharT>
 {
@@ -3733,7 +3862,7 @@
 
 // messages
 
-class _LIBCPP_VISIBLE messages_base
+class _LIBCPP_TYPE_VIS messages_base
 {
 public:
     typedef ptrdiff_t catalog;
@@ -3742,7 +3871,7 @@
 };
 
 template <class _CharT>
-class _LIBCPP_VISIBLE messages
+class _LIBCPP_TYPE_VIS messages
     : public locale::facet,
       public messages_base
 {
@@ -3793,7 +3922,7 @@
 typename messages<_CharT>::catalog
 messages<_CharT>::do_open(const basic_string<char>& __nm, const locale&) const
 {
-#if _WIN32
+#ifdef _WIN32
     return -1;
 #else // _WIN32
     catalog __cat = (catalog)catopen(__nm.c_str(), NL_CAT_LOCALE);
@@ -3808,7 +3937,7 @@
 messages<_CharT>::do_get(catalog __c, int __set, int __msgid,
                          const string_type& __dflt) const
 {
-#if _WIN32
+#ifdef _WIN32
     return __dflt;
 #else // _WIN32
     string __ndflt;
@@ -3830,7 +3959,7 @@
 void
 messages<_CharT>::do_close(catalog __c) const
 {
-#if !_WIN32
+#if !defined(_WIN32)
     if (__c != -1)
         __c <<= 1;
     nl_catd __cat = (nl_catd)__c;
@@ -3842,7 +3971,7 @@
 _LIBCPP_EXTERN_TEMPLATE(class messages<wchar_t>)
 
 template <class _CharT>
-class _LIBCPP_VISIBLE messages_byname
+class _LIBCPP_TYPE_VIS messages_byname
     : public messages<_CharT>
 {
 public:
@@ -3868,7 +3997,7 @@
 template<class _Codecvt, class _Elem = wchar_t,
          class _Wide_alloc = allocator<_Elem>,
          class _Byte_alloc = allocator<char> >
-class _LIBCPP_VISIBLE wstring_convert
+class _LIBCPP_TYPE_VIS wstring_convert
 {
 public:
     typedef basic_string<char, char_traits<char>, _Byte_alloc>   byte_string;
@@ -4121,7 +4250,7 @@
 }
 
 template <class _Codecvt, class _Elem = wchar_t, class _Tr = char_traits<_Elem> >
-class _LIBCPP_VISIBLE wbuffer_convert
+class _LIBCPP_TYPE_VIS wbuffer_convert
     : public basic_streambuf<_Elem, _Tr>
 {
 public:
diff --git a/sources/cxx-stl/llvm-libc++/include/map b/sources/cxx-stl/llvm-libc++/libcxx/include/map
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/map
rename to sources/cxx-stl/llvm-libc++/libcxx/include/map
index dd98da5..abc07a3 100644
--- a/sources/cxx-stl/llvm-libc++/include/map
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/map
@@ -537,7 +537,7 @@
 template <class _TreeIterator> class __map_const_iterator;
 
 template <class _TreeIterator>
-class _LIBCPP_VISIBLE __map_iterator
+class _LIBCPP_TYPE_VIS __map_iterator
 {
     _TreeIterator __i_;
 
@@ -596,13 +596,13 @@
     bool operator!=(const __map_iterator& __x, const __map_iterator& __y)
         {return __x.__i_ != __y.__i_;}
 
-    template <class, class, class, class> friend class _LIBCPP_VISIBLE map;
-    template <class, class, class, class> friend class _LIBCPP_VISIBLE multimap;
-    template <class> friend class _LIBCPP_VISIBLE __map_const_iterator;
+    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS map;
+    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS multimap;
+    template <class> friend class _LIBCPP_TYPE_VIS __map_const_iterator;
 };
 
 template <class _TreeIterator>
-class _LIBCPP_VISIBLE __map_const_iterator
+class _LIBCPP_TYPE_VIS __map_const_iterator
 {
     _TreeIterator __i_;
 
@@ -665,14 +665,14 @@
     bool operator!=(const __map_const_iterator& __x, const __map_const_iterator& __y)
         {return __x.__i_ != __y.__i_;}
 
-    template <class, class, class, class> friend class _LIBCPP_VISIBLE map;
-    template <class, class, class, class> friend class _LIBCPP_VISIBLE multimap;
-    template <class, class, class> friend class _LIBCPP_VISIBLE __tree_const_iterator;
+    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS map;
+    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS multimap;
+    template <class, class, class> friend class _LIBCPP_TYPE_VIS __tree_const_iterator;
 };
 
 template <class _Key, class _Tp, class _Compare = less<_Key>,
           class _Allocator = allocator<pair<const _Key, _Tp> > >
-class _LIBCPP_VISIBLE map
+class _LIBCPP_TYPE_VIS map
 {
 public:
     // types:
@@ -684,7 +684,7 @@
     typedef value_type&                              reference;
     typedef const value_type&                        const_reference;
 
-    class _LIBCPP_VISIBLE value_compare
+    class _LIBCPP_TYPE_VIS value_compare
         : public binary_function<value_type, value_type, bool>
     {
         friend class map;
@@ -1422,7 +1422,7 @@
 
 template <class _Key, class _Tp, class _Compare = less<_Key>,
           class _Allocator = allocator<pair<const _Key, _Tp> > >
-class _LIBCPP_VISIBLE multimap
+class _LIBCPP_TYPE_VIS multimap
 {
 public:
     // types:
@@ -1434,7 +1434,7 @@
     typedef value_type&                              reference;
     typedef const value_type&                        const_reference;
 
-    class _LIBCPP_VISIBLE value_compare
+    class _LIBCPP_TYPE_VIS value_compare
         : public binary_function<value_type, value_type, bool>
     {
         friend class multimap;
diff --git a/sources/cxx-stl/llvm-libc++/include/memory b/sources/cxx-stl/llvm-libc++/libcxx/include/memory
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/memory
rename to sources/cxx-stl/llvm-libc++/libcxx/include/memory
index f80d699..2a8b7e6 100644
--- a/sources/cxx-stl/llvm-libc++/include/memory
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/memory
@@ -621,7 +621,7 @@
 _Tp*
 addressof(_Tp& __x) _NOEXCEPT
 {
-    return (_Tp*)&(char&)__x;
+    return (_Tp*)&reinterpret_cast<const volatile char&>(__x);
 }
 
 #if defined(_LIBCPP_HAS_OBJC_ARC) && !defined(_LIBCPP_PREDEFINED_OBJC_ARC_ADDRESSOF)
@@ -667,7 +667,7 @@
 template <class _Tp> class allocator;
 
 template <>
-class _LIBCPP_VISIBLE allocator<void>
+class _LIBCPP_TYPE_VIS allocator<void>
 {
 public:
     typedef void*             pointer;
@@ -678,7 +678,7 @@
 };
 
 template <>
-class _LIBCPP_VISIBLE allocator<const void>
+class _LIBCPP_TYPE_VIS allocator<const void>
 {
 public:
     typedef const void*       pointer;
@@ -913,7 +913,7 @@
 #endif  // _LIBCPP_HAS_NO_VARIADICS
 
 template <class _Ptr>
-struct _LIBCPP_VISIBLE pointer_traits
+struct _LIBCPP_TYPE_VIS pointer_traits
 {
     typedef _Ptr                                                     pointer;
     typedef typename __pointer_traits_element_type<pointer>::type    element_type;
@@ -936,7 +936,7 @@
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE pointer_traits<_Tp*>
+struct _LIBCPP_TYPE_VIS pointer_traits<_Tp*>
 {
     typedef _Tp*      pointer;
     typedef _Tp       element_type;
@@ -1443,7 +1443,7 @@
 };
 
 template <class _Alloc>
-struct _LIBCPP_VISIBLE allocator_traits
+struct _LIBCPP_TYPE_VIS allocator_traits
 {
     typedef _Alloc                              allocator_type;
     typedef typename allocator_type::value_type value_type;
@@ -1649,7 +1649,7 @@
 // allocator
 
 template <class _Tp>
-class _LIBCPP_VISIBLE allocator
+class _LIBCPP_TYPE_VIS allocator
 {
 public:
     typedef size_t            size_type;
@@ -1741,7 +1741,7 @@
 };
 
 template <class _Tp>
-class _LIBCPP_VISIBLE allocator<const _Tp>
+class _LIBCPP_TYPE_VIS allocator<const _Tp>
 {
 public:
     typedef size_t            size_type;
@@ -1839,7 +1839,7 @@
 bool operator!=(const allocator<_Tp>&, const allocator<_Up>&) _NOEXCEPT {return false;}
 
 template <class _OutputIterator, class _Tp>
-class _LIBCPP_VISIBLE raw_storage_iterator
+class _LIBCPP_TYPE_VIS raw_storage_iterator
     : public iterator<output_iterator_tag,
                       _Tp,                                         // purposefully not C++03
                       ptrdiff_t,                                   // purposefully not C++03
@@ -1892,7 +1892,7 @@
 };
 
 template<class _Tp>
-class _LIBCPP_VISIBLE auto_ptr
+class _LIBCPP_TYPE_VIS auto_ptr
 {
 private:
     _Tp* __ptr_;
@@ -1936,7 +1936,7 @@
 };
 
 template <>
-class _LIBCPP_VISIBLE auto_ptr<void>
+class _LIBCPP_TYPE_VIS auto_ptr<void>
 {
 public:
     typedef void element_type;
@@ -2472,7 +2472,7 @@
 // default_delete
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE default_delete
+struct _LIBCPP_TYPE_VIS default_delete
 {
 #ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR default_delete() _NOEXCEPT = default;
@@ -2485,12 +2485,13 @@
     _LIBCPP_INLINE_VISIBILITY void operator() (_Tp* __ptr) const _NOEXCEPT
         {
             static_assert(sizeof(_Tp) > 0, "default_delete can not delete incomplete type");
+            static_assert(!is_void<_Tp>::value, "default_delete can not delete incomplete type");
             delete __ptr;
         }
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE default_delete<_Tp[]>
+struct _LIBCPP_TYPE_VIS default_delete<_Tp[]>
 {
 public:
 #ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
@@ -2507,12 +2508,13 @@
                          typename enable_if<__same_or_less_cv_qualified<_Up*, _Tp*>::value>::type* = 0) const _NOEXCEPT
         {
             static_assert(sizeof(_Tp) > 0, "default_delete can not delete incomplete type");
+            static_assert(!is_void<_Tp>::value, "default_delete can not delete incomplete type");
             delete [] __ptr;
         }
 };
 
 template <class _Tp, class _Dp = default_delete<_Tp> >
-class _LIBCPP_VISIBLE unique_ptr
+class _LIBCPP_TYPE_VIS unique_ptr
 {
 public:
     typedef _Tp element_type;
@@ -2691,7 +2693,7 @@
 };
 
 template <class _Tp, class _Dp>
-class _LIBCPP_VISIBLE unique_ptr<_Tp[], _Dp>
+class _LIBCPP_TYPE_VIS unique_ptr<_Tp[], _Dp>
 {
 public:
     typedef _Tp element_type;
@@ -3393,7 +3395,7 @@
 };
 
 template<class _Tp>
-struct _LIBCPP_VISIBLE hash<_Tp*>
+struct _LIBCPP_TYPE_VIS hash<_Tp*>
     : public unary_function<_Tp*, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -3410,7 +3412,7 @@
 };
 
 template <class _Tp, class _Dp>
-struct _LIBCPP_VISIBLE hash<unique_ptr<_Tp, _Dp> >
+struct _LIBCPP_TYPE_VIS hash<unique_ptr<_Tp, _Dp> >
 {
     typedef unique_ptr<_Tp, _Dp> argument_type;
     typedef size_t               result_type;
@@ -3583,7 +3585,7 @@
     virtual const char* what() const  _NOEXCEPT;
 };
 
-template<class _Tp> class _LIBCPP_VISIBLE weak_ptr;
+template<class _Tp> class _LIBCPP_TYPE_VIS weak_ptr;
 
 class __shared_count
 {
@@ -3629,10 +3631,13 @@
     long use_count() const _NOEXCEPT {return __shared_count::use_count();}
     __shared_weak_count* lock() _NOEXCEPT;
 
-    // purposefully not protected with #ifndef _LIBCPP_NO_RTTI because doing so
-    //  breaks ABI for those clients who need to compile their projects with
-    //    -fno-rtti and yet link against a libc++.dylib compiled without -fno-rtti.
+    // Define the function out only if we build static libc++ without RTTI.
+    // Otherwise we may break clients who need to compile their projects with
+    // -fno-rtti and yet link against a libc++.dylib compiled
+    // without -fno-rtti.
+#if !defined(_LIBCPP_NO_RTTI) || !defined(_LIBCPP_BUILD_STATIC)
     virtual const void* __get_deleter(const type_info&) const _NOEXCEPT;
+#endif
 private:
     virtual void __on_zero_shared_weak() _NOEXCEPT = 0;
 };
@@ -3749,10 +3754,10 @@
     __a.deallocate(this, 1);
 }
 
-template<class _Tp> class _LIBCPP_VISIBLE enable_shared_from_this;
+template<class _Tp> class _LIBCPP_TYPE_VIS enable_shared_from_this;
 
 template<class _Tp>
-class _LIBCPP_VISIBLE shared_ptr
+class _LIBCPP_TYPE_VIS shared_ptr
 {
 public:
     typedef _Tp element_type;
@@ -4021,8 +4026,8 @@
     _LIBCPP_INLINE_VISIBILITY
     void __enable_weak_this(const void*) _NOEXCEPT {}
 
-    template <class _Up> friend class _LIBCPP_VISIBLE shared_ptr;
-    template <class _Up> friend class _LIBCPP_VISIBLE weak_ptr;
+    template <class _Up> friend class _LIBCPP_TYPE_VIS shared_ptr;
+    template <class _Up> friend class _LIBCPP_TYPE_VIS weak_ptr;
 };
 
 template<class _Tp>
@@ -4918,7 +4923,7 @@
 #endif  // _LIBCPP_NO_RTTI
 
 template<class _Tp>
-class _LIBCPP_VISIBLE weak_ptr
+class _LIBCPP_TYPE_VIS weak_ptr
 {
 public:
     typedef _Tp element_type;
@@ -4993,8 +4998,8 @@
         bool owner_before(const weak_ptr<_Up>& __r) const
         {return __cntrl_ < __r.__cntrl_;}
 
-    template <class _Up> friend class _LIBCPP_VISIBLE weak_ptr;
-    template <class _Up> friend class _LIBCPP_VISIBLE shared_ptr;
+    template <class _Up> friend class _LIBCPP_TYPE_VIS weak_ptr;
+    template <class _Up> friend class _LIBCPP_TYPE_VIS shared_ptr;
 };
 
 template<class _Tp>
@@ -5194,7 +5199,7 @@
 template <class _Tp> struct owner_less;
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE owner_less<shared_ptr<_Tp> >
+struct _LIBCPP_TYPE_VIS owner_less<shared_ptr<_Tp> >
     : binary_function<shared_ptr<_Tp>, shared_ptr<_Tp>, bool>
 {
     typedef bool result_type;
@@ -5210,7 +5215,7 @@
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE owner_less<weak_ptr<_Tp> >
+struct _LIBCPP_TYPE_VIS owner_less<weak_ptr<_Tp> >
     : binary_function<weak_ptr<_Tp>, weak_ptr<_Tp>, bool>
 {
     typedef bool result_type;
@@ -5226,7 +5231,7 @@
 };
 
 template<class _Tp>
-class _LIBCPP_VISIBLE enable_shared_from_this
+class _LIBCPP_TYPE_VIS enable_shared_from_this
 {
     mutable weak_ptr<_Tp> __weak_this_;
 protected:
@@ -5251,7 +5256,7 @@
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE hash<shared_ptr<_Tp> >
+struct _LIBCPP_TYPE_VIS hash<shared_ptr<_Tp> >
 {
     typedef shared_ptr<_Tp>      argument_type;
     typedef size_t               result_type;
@@ -5281,10 +5286,10 @@
     __sp_mut(const __sp_mut&);
     __sp_mut& operator=(const __sp_mut&);
 
-    friend _LIBCPP_VISIBLE __sp_mut& __get_sp_mut(const void*);
+    friend _LIBCPP_FUNC_VIS __sp_mut& __get_sp_mut(const void*);
 };
 
-_LIBCPP_VISIBLE __sp_mut& __get_sp_mut(const void*);
+_LIBCPP_FUNC_VIS __sp_mut& __get_sp_mut(const void*);
 
 template <class _Tp>
 inline _LIBCPP_INLINE_VISIBILITY
@@ -5396,7 +5401,7 @@
 #endif  // __has_feature(cxx_atomic)
 
 //enum class
-struct _LIBCPP_VISIBLE pointer_safety
+struct _LIBCPP_TYPE_VIS pointer_safety
 {
     enum __lx
     {
diff --git a/sources/cxx-stl/llvm-libc++/include/mutex b/sources/cxx-stl/llvm-libc++/libcxx/include/mutex
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/mutex
rename to sources/cxx-stl/llvm-libc++/libcxx/include/mutex
index ee20f02..e2b5d6b 100644
--- a/sources/cxx-stl/llvm-libc++/include/mutex
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/mutex
@@ -187,7 +187,7 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-class _LIBCPP_VISIBLE recursive_mutex
+class _LIBCPP_TYPE_VIS recursive_mutex
 {
     pthread_mutex_t __m_;
 
@@ -209,7 +209,7 @@
     native_handle_type native_handle() {return &__m_;}
 };
 
-class _LIBCPP_VISIBLE timed_mutex
+class _LIBCPP_TYPE_VIS timed_mutex
 {
     mutex              __m_;
     condition_variable __cv_;
@@ -251,7 +251,7 @@
     return false;
 }
 
-class _LIBCPP_VISIBLE recursive_timed_mutex
+class _LIBCPP_TYPE_VIS recursive_timed_mutex
 {
     mutex              __m_;
     condition_variable __cv_;
@@ -425,7 +425,7 @@
 
 #endif  // _LIBCPP_HAS_NO_VARIADICS
 
-struct _LIBCPP_VISIBLE once_flag;
+struct _LIBCPP_TYPE_VIS once_flag;
 
 #ifndef _LIBCPP_HAS_NO_VARIADICS
 
@@ -441,7 +441,7 @@
 
 #endif  // _LIBCPP_HAS_NO_VARIADICS
 
-struct _LIBCPP_VISIBLE once_flag
+struct _LIBCPP_TYPE_VIS once_flag
 {
     _LIBCPP_INLINE_VISIBILITY
     _LIBCPP_CONSTEXPR
diff --git a/sources/cxx-stl/llvm-libc++/include/new b/sources/cxx-stl/llvm-libc++/libcxx/include/new
similarity index 78%
rename from sources/cxx-stl/llvm-libc++/include/new
rename to sources/cxx-stl/llvm-libc++/libcxx/include/new
index ae0951a..1e85798 100644
--- a/sources/cxx-stl/llvm-libc++/include/new
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/new
@@ -83,31 +83,31 @@
 
 void __throw_bad_alloc();  // not in C++ spec
 
-struct _LIBCPP_VISIBLE nothrow_t {};
-extern _LIBCPP_VISIBLE const nothrow_t nothrow;
+struct _LIBCPP_TYPE_VIS nothrow_t {};
+extern _LIBCPP_FUNC_VIS const nothrow_t nothrow;
 typedef void (*new_handler)();
-_LIBCPP_VISIBLE new_handler set_new_handler(new_handler) _NOEXCEPT;
-_LIBCPP_VISIBLE new_handler get_new_handler() _NOEXCEPT;
+_LIBCPP_FUNC_VIS new_handler set_new_handler(new_handler) _NOEXCEPT;
+_LIBCPP_FUNC_VIS new_handler get_new_handler() _NOEXCEPT;
 
 }  // std
 
-_LIBCPP_VISIBLE void* operator new(std::size_t __sz)
+_LIBCPP_FUNC_VIS void* operator new(std::size_t __sz)
 #if !__has_feature(cxx_noexcept)
     throw(std::bad_alloc)
 #endif
 ;
-_LIBCPP_VISIBLE void* operator new(std::size_t __sz, const std::nothrow_t&) _NOEXCEPT _NOALIAS;
-_LIBCPP_VISIBLE void  operator delete(void* __p) _NOEXCEPT;
-_LIBCPP_VISIBLE void  operator delete(void* __p, const std::nothrow_t&) _NOEXCEPT;
+_LIBCPP_FUNC_VIS void* operator new(std::size_t __sz, const std::nothrow_t&) _NOEXCEPT _NOALIAS;
+_LIBCPP_FUNC_VIS void  operator delete(void* __p) _NOEXCEPT;
+_LIBCPP_FUNC_VIS void  operator delete(void* __p, const std::nothrow_t&) _NOEXCEPT;
 
-_LIBCPP_VISIBLE void* operator new[](std::size_t __sz)
+_LIBCPP_FUNC_VIS void* operator new[](std::size_t __sz)
 #if !__has_feature(cxx_noexcept)
     throw(std::bad_alloc)
 #endif
 ;
-_LIBCPP_VISIBLE void* operator new[](std::size_t __sz, const std::nothrow_t&) _NOEXCEPT _NOALIAS;
-_LIBCPP_VISIBLE void  operator delete[](void* __p) _NOEXCEPT;
-_LIBCPP_VISIBLE void  operator delete[](void* __p, const std::nothrow_t&) _NOEXCEPT;
+_LIBCPP_FUNC_VIS void* operator new[](std::size_t __sz, const std::nothrow_t&) _NOEXCEPT _NOALIAS;
+_LIBCPP_FUNC_VIS void  operator delete[](void* __p) _NOEXCEPT;
+_LIBCPP_FUNC_VIS void  operator delete[](void* __p, const std::nothrow_t&) _NOEXCEPT;
 
 _LIBCPP_INLINE_VISIBILITY inline void* operator new  (std::size_t, void* __p) _NOEXCEPT {return __p;}
 _LIBCPP_INLINE_VISIBILITY inline void* operator new[](std::size_t, void* __p) _NOEXCEPT {return __p;}
diff --git a/sources/cxx-stl/llvm-libc++/include/numeric b/sources/cxx-stl/llvm-libc++/libcxx/include/numeric
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/numeric
rename to sources/cxx-stl/llvm-libc++/libcxx/include/numeric
diff --git a/sources/cxx-stl/llvm-libc++/include/ostream b/sources/cxx-stl/llvm-libc++/libcxx/include/ostream
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/include/ostream
rename to sources/cxx-stl/llvm-libc++/libcxx/include/ostream
index b3b6df5..eac9c8f 100644
--- a/sources/cxx-stl/llvm-libc++/include/ostream
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/ostream
@@ -140,7 +140,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 template <class _CharT, class _Traits>
-class _LIBCPP_VISIBLE basic_ostream
+class _LIBCPP_TYPE_VIS basic_ostream
     : virtual public basic_ios<_CharT, _Traits>
 {
 public:
@@ -169,7 +169,7 @@
 public:
 
     // 27.7.2.4 Prefix/suffix:
-    class _LIBCPP_VISIBLE sentry;
+    class _LIBCPP_TYPE_VIS sentry;
 
     // 27.7.2.6 Formatted output:
     basic_ostream& operator<<(basic_ostream& (*__pf)(basic_ostream&));
@@ -207,7 +207,7 @@
 };
 
 template <class _CharT, class _Traits>
-class _LIBCPP_VISIBLE basic_ostream<_CharT, _Traits>::sentry
+class _LIBCPP_TYPE_VIS basic_ostream<_CharT, _Traits>::sentry
 {
     bool __ok_;
     basic_ostream<_CharT, _Traits>& __os_;
diff --git a/sources/cxx-stl/llvm-libc++/include/queue b/sources/cxx-stl/llvm-libc++/libcxx/include/queue
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/queue
rename to sources/cxx-stl/llvm-libc++/libcxx/include/queue
index 4741f00..8d1a9df 100644
--- a/sources/cxx-stl/llvm-libc++/include/queue
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/queue
@@ -177,7 +177,7 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-template <class _Tp, class _Container> class _LIBCPP_VISIBLE queue;
+template <class _Tp, class _Container> class _LIBCPP_TYPE_VIS queue;
 
 template <class _Tp, class _Container>
 _LIBCPP_INLINE_VISIBILITY
@@ -190,7 +190,7 @@
 operator< (const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y);
 
 template <class _Tp, class _Container = deque<_Tp> >
-class _LIBCPP_VISIBLE queue
+class _LIBCPP_TYPE_VIS queue
 {
 public:
     typedef _Container                               container_type;
@@ -376,14 +376,14 @@
 }
 
 template <class _Tp, class _Container, class _Alloc>
-struct _LIBCPP_VISIBLE uses_allocator<queue<_Tp, _Container>, _Alloc>
+struct _LIBCPP_TYPE_VIS uses_allocator<queue<_Tp, _Container>, _Alloc>
     : public uses_allocator<_Container, _Alloc>
 {
 };
 
 template <class _Tp, class _Container = vector<_Tp>,
           class _Compare = less<typename _Container::value_type> >
-class _LIBCPP_VISIBLE priority_queue
+class _LIBCPP_TYPE_VIS priority_queue
 {
 public:
     typedef _Container                               container_type;
@@ -707,7 +707,7 @@
 }
 
 template <class _Tp, class _Container, class _Compare, class _Alloc>
-struct _LIBCPP_VISIBLE uses_allocator<priority_queue<_Tp, _Container, _Compare>, _Alloc>
+struct _LIBCPP_TYPE_VIS uses_allocator<priority_queue<_Tp, _Container, _Compare>, _Alloc>
     : public uses_allocator<_Container, _Alloc>
 {
 };
diff --git a/sources/cxx-stl/llvm-libc++/include/random b/sources/cxx-stl/llvm-libc++/libcxx/include/random
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/random
rename to sources/cxx-stl/llvm-libc++/libcxx/include/random
index 04d942b..92722ea 100644
--- a/sources/cxx-stl/llvm-libc++/include/random
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/random
@@ -1813,7 +1813,7 @@
 };
 
 template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-class _LIBCPP_VISIBLE linear_congruential_engine;
+class _LIBCPP_TYPE_VIS linear_congruential_engine;
 
 template <class _CharT, class _Traits,
           class _Up, _Up _Ap, _Up _Cp, _Up _Np>
@@ -1829,7 +1829,7 @@
            linear_congruential_engine<_Up, _Ap, _Cp, _Np>& __x);
 
 template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-class _LIBCPP_VISIBLE linear_congruential_engine
+class _LIBCPP_TYPE_VIS linear_congruential_engine
 {
 public:
     // types
@@ -2038,7 +2038,7 @@
 template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
           _UIntType __a, size_t __u, _UIntType __d, size_t __s,
           _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-class _LIBCPP_VISIBLE mersenne_twister_engine;
+class _LIBCPP_TYPE_VIS mersenne_twister_engine;
 
 template <class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
           _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
@@ -2080,7 +2080,7 @@
 template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
           _UIntType __a, size_t __u, _UIntType __d, size_t __s,
           _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-class _LIBCPP_VISIBLE mersenne_twister_engine
+class _LIBCPP_TYPE_VIS mersenne_twister_engine
 {
 public:
     // types
@@ -2526,7 +2526,7 @@
 // subtract_with_carry_engine
 
 template<class _UIntType, size_t __w, size_t __s, size_t __r>
-class _LIBCPP_VISIBLE subtract_with_carry_engine;
+class _LIBCPP_TYPE_VIS subtract_with_carry_engine;
 
 template<class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
 bool
@@ -2554,7 +2554,7 @@
            subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x);
 
 template<class _UIntType, size_t __w, size_t __s, size_t __r>
-class _LIBCPP_VISIBLE subtract_with_carry_engine
+class _LIBCPP_TYPE_VIS subtract_with_carry_engine
 {
 public:
     // types
@@ -2837,7 +2837,7 @@
 // discard_block_engine
 
 template<class _Engine, size_t __p, size_t __r>
-class _LIBCPP_VISIBLE discard_block_engine
+class _LIBCPP_TYPE_VIS discard_block_engine
 {
     _Engine __e_;
     int     __n_;
@@ -3010,7 +3010,7 @@
 // independent_bits_engine
 
 template<class _Engine, size_t __w, class _UIntType>
-class _LIBCPP_VISIBLE independent_bits_engine
+class _LIBCPP_TYPE_VIS independent_bits_engine
 {
     template <class _UI, _UI _R0, size_t _Wp, size_t _Mp>
     class __get_n
@@ -3273,7 +3273,7 @@
 };
 
 template<class _Engine, size_t __k>
-class _LIBCPP_VISIBLE shuffle_order_engine
+class _LIBCPP_TYPE_VIS shuffle_order_engine
 {
     static_assert(0 < __k, "shuffle_order_engine invalid parameters");
 public:
@@ -3500,7 +3500,7 @@
 
 // random_device
 
-class _LIBCPP_VISIBLE random_device
+class _LIBCPP_TYPE_VIS random_device
 {
     int __f_;
 public:
@@ -3534,7 +3534,7 @@
 
 // seed_seq
 
-class _LIBCPP_VISIBLE seed_seq
+class _LIBCPP_TYPE_VIS seed_seq
 {
 public:
     // types
@@ -3711,13 +3711,13 @@
 // uniform_real_distribution
 
 template<class _RealType = double>
-class _LIBCPP_VISIBLE uniform_real_distribution
+class _LIBCPP_TYPE_VIS uniform_real_distribution
 {
 public:
     // types
     typedef _RealType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         result_type __a_;
         result_type __b_;
@@ -3832,13 +3832,13 @@
 
 // bernoulli_distribution
 
-class _LIBCPP_VISIBLE bernoulli_distribution
+class _LIBCPP_TYPE_VIS bernoulli_distribution
 {
 public:
     // types
     typedef bool result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         double __p_;
     public:
@@ -3941,13 +3941,13 @@
 // binomial_distribution
 
 template<class _IntType = int>
-class _LIBCPP_VISIBLE binomial_distribution
+class _LIBCPP_TYPE_VIS binomial_distribution
 {
 public:
     // types
     typedef _IntType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         result_type __t_;
         double __p_;
@@ -4106,13 +4106,13 @@
 // exponential_distribution
 
 template<class _RealType = double>
-class _LIBCPP_VISIBLE exponential_distribution
+class _LIBCPP_TYPE_VIS exponential_distribution
 {
 public:
     // types
     typedef _RealType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         result_type __lambda_;
     public:
@@ -4221,13 +4221,13 @@
 // normal_distribution
 
 template<class _RealType = double>
-class _LIBCPP_VISIBLE normal_distribution
+class _LIBCPP_TYPE_VIS normal_distribution
 {
 public:
     // types
     typedef _RealType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         result_type __mean_;
         result_type __stddev_;
@@ -4389,13 +4389,13 @@
 // lognormal_distribution
 
 template<class _RealType = double>
-class _LIBCPP_VISIBLE lognormal_distribution
+class _LIBCPP_TYPE_VIS lognormal_distribution
 {
 public:
     // types
     typedef _RealType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         normal_distribution<result_type> __nd_;
     public:
@@ -4514,13 +4514,13 @@
 // poisson_distribution
 
 template<class _IntType = int>
-class _LIBCPP_VISIBLE poisson_distribution
+class _LIBCPP_TYPE_VIS poisson_distribution
 {
 public:
     // types
     typedef _IntType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         double __mean_;
         double __s_;
@@ -4745,13 +4745,13 @@
 // weibull_distribution
 
 template<class _RealType = double>
-class _LIBCPP_VISIBLE weibull_distribution
+class _LIBCPP_TYPE_VIS weibull_distribution
 {
 public:
     // types
     typedef _RealType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         result_type __a_;
         result_type __b_;
@@ -4859,13 +4859,13 @@
 }
 
 template<class _RealType = double>
-class _LIBCPP_VISIBLE extreme_value_distribution
+class _LIBCPP_TYPE_VIS extreme_value_distribution
 {
 public:
     // types
     typedef _RealType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         result_type __a_;
         result_type __b_;
@@ -4980,13 +4980,13 @@
 // gamma_distribution
 
 template<class _RealType = double>
-class _LIBCPP_VISIBLE gamma_distribution
+class _LIBCPP_TYPE_VIS gamma_distribution
 {
 public:
     // types
     typedef _RealType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         result_type __alpha_;
         result_type __beta_;
@@ -5152,13 +5152,13 @@
 // negative_binomial_distribution
 
 template<class _IntType = int>
-class _LIBCPP_VISIBLE negative_binomial_distribution
+class _LIBCPP_TYPE_VIS negative_binomial_distribution
 {
 public:
     // types
     typedef _IntType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         result_type __k_;
         double __p_;
@@ -5287,13 +5287,13 @@
 // geometric_distribution
 
 template<class _IntType = int>
-class _LIBCPP_VISIBLE geometric_distribution
+class _LIBCPP_TYPE_VIS geometric_distribution
 {
 public:
     // types
     typedef _IntType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         double __p_;
     public:
@@ -5389,13 +5389,13 @@
 // chi_squared_distribution
 
 template<class _RealType = double>
-class _LIBCPP_VISIBLE chi_squared_distribution
+class _LIBCPP_TYPE_VIS chi_squared_distribution
 {
 public:
     // types
     typedef _RealType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         result_type __n_;
     public:
@@ -5495,13 +5495,13 @@
 // cauchy_distribution
 
 template<class _RealType = double>
-class _LIBCPP_VISIBLE cauchy_distribution
+class _LIBCPP_TYPE_VIS cauchy_distribution
 {
 public:
     // types
     typedef _RealType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         result_type __a_;
         result_type __b_;
@@ -5618,13 +5618,13 @@
 // fisher_f_distribution
 
 template<class _RealType = double>
-class _LIBCPP_VISIBLE fisher_f_distribution
+class _LIBCPP_TYPE_VIS fisher_f_distribution
 {
 public:
     // types
     typedef _RealType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         result_type __m_;
         result_type __n_;
@@ -5740,13 +5740,13 @@
 // student_t_distribution
 
 template<class _RealType = double>
-class _LIBCPP_VISIBLE student_t_distribution
+class _LIBCPP_TYPE_VIS student_t_distribution
 {
 public:
     // types
     typedef _RealType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         result_type __n_;
     public:
@@ -5853,13 +5853,13 @@
 // discrete_distribution
 
 template<class _IntType = int>
-class _LIBCPP_VISIBLE discrete_distribution
+class _LIBCPP_TYPE_VIS discrete_distribution
 {
 public:
     // types
     typedef _IntType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         vector<double> __p_;
     public:
@@ -6084,13 +6084,13 @@
 // piecewise_constant_distribution
 
 template<class _RealType = double>
-class _LIBCPP_VISIBLE piecewise_constant_distribution
+class _LIBCPP_TYPE_VIS piecewise_constant_distribution
 {
 public:
     // types
     typedef _RealType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         vector<result_type> __b_;
         vector<result_type> __densities_;
@@ -6408,13 +6408,13 @@
 // piecewise_linear_distribution
 
 template<class _RealType = double>
-class _LIBCPP_VISIBLE piecewise_linear_distribution
+class _LIBCPP_TYPE_VIS piecewise_linear_distribution
 {
 public:
     // types
     typedef _RealType result_type;
 
-    class _LIBCPP_VISIBLE param_type
+    class _LIBCPP_TYPE_VIS param_type
     {
         vector<result_type> __b_;
         vector<result_type> __densities_;
diff --git a/sources/cxx-stl/llvm-libc++/include/ratio b/sources/cxx-stl/llvm-libc++/libcxx/include/ratio
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/include/ratio
rename to sources/cxx-stl/llvm-libc++/libcxx/include/ratio
index 23f2267..f4e741e 100644
--- a/sources/cxx-stl/llvm-libc++/include/ratio
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/ratio
@@ -231,7 +231,7 @@
 };
 
 template <intmax_t _Num, intmax_t _Den = 1>
-class _LIBCPP_VISIBLE ratio
+class _LIBCPP_TYPE_VIS ratio
 {
     static_assert(__static_abs<_Num>::value >= 0, "ratio numerator is out of range");
     static_assert(_Den != 0, "ratio divide by 0");
@@ -292,7 +292,7 @@
 #else  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
 
 template <class _R1, class _R2>
-struct _LIBCPP_VISIBLE ratio_multiply
+struct _LIBCPP_TYPE_VIS ratio_multiply
     : public __ratio_multiply<_R1, _R2>::type {};
 
 #endif  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
@@ -319,7 +319,7 @@
 #else  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
 
 template <class _R1, class _R2>
-struct _LIBCPP_VISIBLE ratio_divide
+struct _LIBCPP_TYPE_VIS ratio_divide
     : public __ratio_divide<_R1, _R2>::type {};
 
 #endif  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
@@ -354,7 +354,7 @@
 #else  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
 
 template <class _R1, class _R2>
-struct _LIBCPP_VISIBLE ratio_add
+struct _LIBCPP_TYPE_VIS ratio_add
     : public __ratio_add<_R1, _R2>::type {};
 
 #endif  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
@@ -389,7 +389,7 @@
 #else  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
 
 template <class _R1, class _R2>
-struct _LIBCPP_VISIBLE ratio_subtract
+struct _LIBCPP_TYPE_VIS ratio_subtract
     : public __ratio_subtract<_R1, _R2>::type {};
 
 #endif  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
@@ -397,11 +397,11 @@
 // ratio_equal
 
 template <class _R1, class _R2>
-struct _LIBCPP_VISIBLE ratio_equal
+struct _LIBCPP_TYPE_VIS ratio_equal
     : public integral_constant<bool, _R1::num == _R2::num && _R1::den == _R2::den> {};
 
 template <class _R1, class _R2>
-struct _LIBCPP_VISIBLE ratio_not_equal
+struct _LIBCPP_TYPE_VIS ratio_not_equal
     : public integral_constant<bool, !ratio_equal<_R1, _R2>::value> {};
 
 // ratio_less
@@ -460,19 +460,19 @@
 };
 
 template <class _R1, class _R2>
-struct _LIBCPP_VISIBLE ratio_less
+struct _LIBCPP_TYPE_VIS ratio_less
     : public integral_constant<bool, __ratio_less<_R1, _R2>::value> {};
 
 template <class _R1, class _R2>
-struct _LIBCPP_VISIBLE ratio_less_equal
+struct _LIBCPP_TYPE_VIS ratio_less_equal
     : public integral_constant<bool, !ratio_less<_R2, _R1>::value> {};
 
 template <class _R1, class _R2>
-struct _LIBCPP_VISIBLE ratio_greater
+struct _LIBCPP_TYPE_VIS ratio_greater
     : public integral_constant<bool, ratio_less<_R2, _R1>::value> {};
 
 template <class _R1, class _R2>
-struct _LIBCPP_VISIBLE ratio_greater_equal
+struct _LIBCPP_TYPE_VIS ratio_greater_equal
     : public integral_constant<bool, !ratio_less<_R1, _R2>::value> {};
 
 template <class _R1, class _R2>
diff --git a/sources/cxx-stl/llvm-libc++/include/regex b/sources/cxx-stl/llvm-libc++/libcxx/include/regex
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/include/regex
rename to sources/cxx-stl/llvm-libc++/libcxx/include/regex
index 85f3882..20818b6 100644
--- a/sources/cxx-stl/llvm-libc++/include/regex
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/regex
@@ -764,7 +764,7 @@
 syntax_option_type
 operator~(syntax_option_type __x)
 {
-    return syntax_option_type(~int(__x));
+    return syntax_option_type(~int(__x) & 0x1FF);
 }
 
 inline _LIBCPP_INLINE_VISIBILITY
@@ -840,7 +840,7 @@
 match_flag_type
 operator~(match_flag_type __x)
 {
-    return match_flag_type(~int(__x));
+    return match_flag_type(~int(__x) & 0x0FFF);
 }
 
 inline _LIBCPP_INLINE_VISIBILITY
@@ -925,7 +925,7 @@
 };
 
 template <class _CharT>
-struct _LIBCPP_VISIBLE regex_traits
+struct _LIBCPP_TYPE_VIS regex_traits
 {
 public:
     typedef _CharT                  char_type;
@@ -1010,6 +1010,12 @@
 
 template <class _CharT> const typename regex_traits<_CharT>::char_class_type regex_traits<_CharT>::__regex_word = 0x80;
 
+#if 0
+template <class _CharT>
+const typename regex_traits<_CharT>::char_class_type
+regex_traits<_CharT>::__regex_word;
+#endif
+
 template <class _CharT>
 regex_traits<_CharT>::regex_traits()
 {
@@ -1233,11 +1239,11 @@
 
 template <class _CharT> class __node;
 
-template <class _BidirectionalIterator> class _LIBCPP_VISIBLE sub_match;
+template <class _BidirectionalIterator> class _LIBCPP_TYPE_VIS sub_match;
 
 template <class _BidirectionalIterator,
           class _Allocator = allocator<sub_match<_BidirectionalIterator> > >
-class _LIBCPP_VISIBLE match_results;
+class _LIBCPP_TYPE_VIS match_results;
 
 template <class _CharT>
 struct __state
@@ -2413,7 +2419,7 @@
 template <class _CharT, class _Traits> class __lookahead;
 
 template <class _CharT, class _Traits = regex_traits<_CharT> >
-class _LIBCPP_VISIBLE basic_regex
+class _LIBCPP_TYPE_VIS basic_regex
 {
 public:
     // types:
@@ -4751,7 +4757,7 @@
 // sub_match
 
 template <class _BidirectionalIterator>
-class _LIBCPP_VISIBLE sub_match
+class _LIBCPP_TYPE_VIS sub_match
     : public pair<_BidirectionalIterator, _BidirectionalIterator>
 {
 public:
@@ -5174,7 +5180,7 @@
 }
 
 template <class _BidirectionalIterator, class _Allocator>
-class _LIBCPP_VISIBLE match_results
+class _LIBCPP_TYPE_VIS match_results
 {
 public:
     typedef _Allocator                                        allocator_type;
@@ -5960,7 +5966,7 @@
 template <class _BidirectionalIterator,
           class _CharT = typename iterator_traits<_BidirectionalIterator>::value_type,
           class _Traits = regex_traits<_CharT> >
-class _LIBCPP_VISIBLE regex_iterator
+class _LIBCPP_TYPE_VIS regex_iterator
 {
 public:
     typedef basic_regex<_CharT, _Traits>          regex_type;
@@ -6072,7 +6078,7 @@
 template <class _BidirectionalIterator,
           class _CharT = typename iterator_traits<_BidirectionalIterator>::value_type,
           class _Traits = regex_traits<_CharT> >
-class _LIBCPP_VISIBLE regex_token_iterator
+class _LIBCPP_TYPE_VIS regex_token_iterator
 {
 public:
     typedef basic_regex<_CharT, _Traits>      regex_type;
diff --git a/sources/cxx-stl/llvm-libc++/include/scoped_allocator b/sources/cxx-stl/llvm-libc++/libcxx/include/scoped_allocator
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/include/scoped_allocator
rename to sources/cxx-stl/llvm-libc++/libcxx/include/scoped_allocator
index cd05102..9253234 100644
--- a/sources/cxx-stl/llvm-libc++/include/scoped_allocator
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/scoped_allocator
@@ -365,7 +365,7 @@
 };
 
 template <class _OuterAlloc, class... _InnerAllocs>
-class _LIBCPP_VISIBLE scoped_allocator_adaptor<_OuterAlloc, _InnerAllocs...>
+class _LIBCPP_TYPE_VIS scoped_allocator_adaptor<_OuterAlloc, _InnerAllocs...>
     : public __scoped_allocator_storage<_OuterAlloc, _InnerAllocs...>
 {
     typedef __scoped_allocator_storage<_OuterAlloc, _InnerAllocs...> base;
diff --git a/sources/cxx-stl/llvm-libc++/include/set b/sources/cxx-stl/llvm-libc++/libcxx/include/set
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/include/set
rename to sources/cxx-stl/llvm-libc++/libcxx/include/set
index 36d3dd4..11ea965 100644
--- a/sources/cxx-stl/llvm-libc++/include/set
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/set
@@ -346,7 +346,7 @@
 
 template <class _Key, class _Compare = less<_Key>,
           class _Allocator = allocator<_Key> >
-class _LIBCPP_VISIBLE set
+class _LIBCPP_TYPE_VIS set
 {
 public:
     // types:
@@ -685,7 +685,7 @@
 
 template <class _Key, class _Compare = less<_Key>,
           class _Allocator = allocator<_Key> >
-class _LIBCPP_VISIBLE multiset
+class _LIBCPP_TYPE_VIS multiset
 {
 public:
     // types:
diff --git a/sources/cxx-stl/llvm-libc++/include/sstream b/sources/cxx-stl/llvm-libc++/libcxx/include/sstream
similarity index 87%
rename from sources/cxx-stl/llvm-libc++/include/sstream
rename to sources/cxx-stl/llvm-libc++/libcxx/include/sstream
index 22450f0..a8f8148 100644
--- a/sources/cxx-stl/llvm-libc++/include/sstream
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/sstream
@@ -186,7 +186,7 @@
 // basic_stringbuf
 
 template <class _CharT, class _Traits, class _Allocator>
-class _LIBCPP_VISIBLE basic_stringbuf
+class _LIBCPP_TYPE_VIS basic_stringbuf
     : public basic_streambuf<_CharT, _Traits>
 {
 public:
@@ -260,17 +260,36 @@
 basic_stringbuf<_CharT, _Traits, _Allocator>::basic_stringbuf(basic_stringbuf&& __rhs)
     : __mode_(__rhs.__mode_)
 {
-    ptrdiff_t __ninp = __rhs.gptr()  - __rhs.eback();
-    ptrdiff_t __einp = __rhs.egptr() - __rhs.eback();
-    ptrdiff_t __nout = __rhs.pptr()  - __rhs.pbase();
-    ptrdiff_t __eout = __rhs.epptr() - __rhs.pbase();
-    ptrdiff_t __hm   = __rhs.__hm_   - __rhs.pbase();
+    char_type* __p = const_cast<char_type*>(__rhs.__str_.data());
+    ptrdiff_t __binp = -1;
+    ptrdiff_t __ninp = -1;
+    ptrdiff_t __einp = -1;
+    if (__rhs.eback() != nullptr)
+    {
+        __binp = __rhs.eback() - __p;
+        __ninp = __rhs.gptr() - __p;
+        __einp = __rhs.egptr() - __p;
+    }
+    ptrdiff_t __bout = -1;
+    ptrdiff_t __nout = -1;
+    ptrdiff_t __eout = -1;
+    if (__rhs.pbase() != nullptr)
+    {
+        __bout = __rhs.pbase() - __p;
+        __nout = __rhs.pptr() - __p;
+        __eout = __rhs.epptr() - __p;
+    }
+    ptrdiff_t __hm = __rhs.__hm_ == nullptr ? -1 : __rhs.__hm_ - __p;
     __str_ = _VSTD::move(__rhs.__str_);
-    char_type* __p = const_cast<char_type*>(__str_.data());
-    this->setg(__p, __p + __ninp, __p + __einp);
-    this->setp(__p, __p + __eout);
-    this->pbump(__nout);
-    __hm_ = __p + __hm;
+    __p = const_cast<char_type*>(__str_.data());
+    if (__binp != -1)
+        this->setg(__p + __binp, __p + __ninp, __p + __einp);
+    if (__bout != -1)
+    {
+        this->setp(__p + __bout, __p + __eout);
+        this->pbump(__nout);
+    }
+    __hm_ = __hm == -1 ? nullptr : __p + __hm;
     __p = const_cast<char_type*>(__rhs.__str_.data());
     __rhs.setg(__p, __p, __p);
     __rhs.setp(__p, __p);
@@ -282,18 +301,37 @@
 basic_stringbuf<_CharT, _Traits, _Allocator>&
 basic_stringbuf<_CharT, _Traits, _Allocator>::operator=(basic_stringbuf&& __rhs)
 {
-    ptrdiff_t __ninp = __rhs.gptr()  - __rhs.eback();
-    ptrdiff_t __einp = __rhs.egptr() - __rhs.eback();
-    ptrdiff_t __nout = __rhs.pptr()  - __rhs.pbase();
-    ptrdiff_t __eout = __rhs.epptr() - __rhs.pbase();
-    ptrdiff_t __hm   = __rhs.__hm_   - __rhs.pbase();
-    __mode_ = __rhs.__mode_;
+    char_type* __p = const_cast<char_type*>(__rhs.__str_.data());
+    ptrdiff_t __binp = -1;
+    ptrdiff_t __ninp = -1;
+    ptrdiff_t __einp = -1;
+    if (__rhs.eback() != nullptr)
+    {
+        __binp = __rhs.eback() - __p;
+        __ninp = __rhs.gptr() - __p;
+        __einp = __rhs.egptr() - __p;
+    }
+    ptrdiff_t __bout = -1;
+    ptrdiff_t __nout = -1;
+    ptrdiff_t __eout = -1;
+    if (__rhs.pbase() != nullptr)
+    {
+        __bout = __rhs.pbase() - __p;
+        __nout = __rhs.pptr() - __p;
+        __eout = __rhs.epptr() - __p;
+    }
+    ptrdiff_t __hm = __rhs.__hm_ == nullptr ? -1 : __rhs.__hm_ - __p;
     __str_ = _VSTD::move(__rhs.__str_);
-    char_type* __p = const_cast<char_type*>(__str_.data());
-    this->setg(__p, __p + __ninp, __p + __einp);
-    this->setp(__p, __p + __eout);
-    this->pbump(__nout);
-    __hm_ = __p + __hm;
+    __p = const_cast<char_type*>(__str_.data());
+    if (__binp != -1)
+        this->setg(__p + __binp, __p + __ninp, __p + __einp);
+    if (__bout != -1)
+    {
+        this->setp(__p + __bout, __p + __eout);
+        this->pbump(__nout);
+    }
+    __hm_ = __hm == -1 ? nullptr : __p + __hm;
+    __mode_ = __rhs.__mode_;
     __p = const_cast<char_type*>(__rhs.__str_.data());
     __rhs.setg(__p, __p, __p);
     __rhs.setp(__p, __p);
@@ -308,28 +346,74 @@
 void
 basic_stringbuf<_CharT, _Traits, _Allocator>::swap(basic_stringbuf& __rhs)
 {
-    ptrdiff_t __rninp = __rhs.gptr()  - __rhs.eback();
-    ptrdiff_t __reinp = __rhs.egptr() - __rhs.eback();
-    ptrdiff_t __rnout = __rhs.pptr()  - __rhs.pbase();
-    ptrdiff_t __reout = __rhs.epptr() - __rhs.pbase();
-    ptrdiff_t __rhm   = __rhs.__hm_   - __rhs.pbase();
-    ptrdiff_t __lninp = this->gptr()  - this->eback();
-    ptrdiff_t __leinp = this->egptr() - this->eback();
-    ptrdiff_t __lnout = this->pptr()  - this->pbase();
-    ptrdiff_t __leout = this->epptr() - this->pbase();
-    ptrdiff_t __lhm   = this->__hm_   - this->pbase();
+    char_type* __p = const_cast<char_type*>(__rhs.__str_.data());
+    ptrdiff_t __rbinp = -1;
+    ptrdiff_t __rninp = -1;
+    ptrdiff_t __reinp = -1;
+    if (__rhs.eback() != nullptr)
+    {
+        __rbinp = __rhs.eback() - __p;
+        __rninp = __rhs.gptr() - __p;
+        __reinp = __rhs.egptr() - __p;
+    }
+    ptrdiff_t __rbout = -1;
+    ptrdiff_t __rnout = -1;
+    ptrdiff_t __reout = -1;
+    if (__rhs.pbase() != nullptr)
+    {
+        __rbout = __rhs.pbase() - __p;
+        __rnout = __rhs.pptr() - __p;
+        __reout = __rhs.epptr() - __p;
+    }
+    ptrdiff_t __rhm = __rhs.__hm_ == nullptr ? -1 : __rhs.__hm_ - __p;
+    __p = const_cast<char_type*>(__str_.data());
+    ptrdiff_t __lbinp = -1;
+    ptrdiff_t __lninp = -1;
+    ptrdiff_t __leinp = -1;
+    if (this->eback() != nullptr)
+    {
+        __lbinp = this->eback() - __p;
+        __lninp = this->gptr() - __p;
+        __leinp = this->egptr() - __p;
+    }
+    ptrdiff_t __lbout = -1;
+    ptrdiff_t __lnout = -1;
+    ptrdiff_t __leout = -1;
+    if (this->pbase() != nullptr)
+    {
+        __lbout = this->pbase() - __p;
+        __lnout = this->pptr() - __p;
+        __leout = this->epptr() - __p;
+    }
+    ptrdiff_t __lhm = __hm_ == nullptr ? -1 : __hm_ - __p;
     _VSTD::swap(__mode_, __rhs.__mode_);
     __str_.swap(__rhs.__str_);
-    char_type* __p = const_cast<char_type*>(__str_.data());
-    this->setg(__p, __p + __rninp, __p + __reinp);
-    this->setp(__p, __p + __reout);
-    this->pbump(__rnout);
-    __hm_ = __p + __rhm;
+    __p = const_cast<char_type*>(__str_.data());
+    if (__rbinp != -1)
+        this->setg(__p + __rbinp, __p + __rninp, __p + __reinp);
+    else
+        this->setg(nullptr, nullptr, nullptr);
+    if (__rbout != -1)
+    {
+        this->setp(__p + __rbout, __p + __reout);
+        this->pbump(__rnout);
+    }
+    else
+        this->setp(nullptr, nullptr);
+    __hm_ = __rhm == -1 ? nullptr : __p + __rhm;
     __p = const_cast<char_type*>(__rhs.__str_.data());
-    __rhs.setg(__p, __p + __lninp, __p + __leinp);
-    __rhs.setp(__p, __p + __leout);
-    __rhs.pbump(__lnout);
-    __rhs.__hm_ = __p + __lhm;
+    if (__lbinp != -1)
+        __rhs.setg(__p + __lbinp, __p + __lninp, __p + __leinp);
+    else
+        __rhs.setg(nullptr, nullptr, nullptr);
+    if (__lbout != -1)
+    {
+        __rhs.setp(__p + __lbout, __p + __leout);
+        __rhs.pbump(__lnout);
+    }
+    else
+        __rhs.setp(nullptr, nullptr);
+    __rhs.__hm_ = __lhm == -1 ? nullptr : __p + __lhm;
     locale __tl = __rhs.getloc();
     __rhs.pubimbue(this->getloc());
     this->pubimbue(__tl);
@@ -529,7 +613,7 @@
 // basic_istringstream
 
 template <class _CharT, class _Traits, class _Allocator>
-class _LIBCPP_VISIBLE basic_istringstream
+class _LIBCPP_TYPE_VIS basic_istringstream
     : public basic_istream<_CharT, _Traits>
 {
 public:
@@ -648,7 +732,7 @@
 // basic_ostringstream
 
 template <class _CharT, class _Traits, class _Allocator>
-class _LIBCPP_VISIBLE basic_ostringstream
+class _LIBCPP_TYPE_VIS basic_ostringstream
     : public basic_ostream<_CharT, _Traits>
 {
 public:
@@ -767,7 +851,7 @@
 // basic_stringstream
 
 template <class _CharT, class _Traits, class _Allocator>
-class _LIBCPP_VISIBLE basic_stringstream
+class _LIBCPP_TYPE_VIS basic_stringstream
     : public basic_iostream<_CharT, _Traits>
 {
 public:
diff --git a/sources/cxx-stl/llvm-libc++/include/stack b/sources/cxx-stl/llvm-libc++/libcxx/include/stack
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/include/stack
rename to sources/cxx-stl/llvm-libc++/libcxx/include/stack
index 12fb35b..b8a7f4c 100644
--- a/sources/cxx-stl/llvm-libc++/include/stack
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/stack
@@ -91,7 +91,7 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-template <class _Tp, class _Container> class _LIBCPP_VISIBLE stack;
+template <class _Tp, class _Container> class _LIBCPP_TYPE_VIS stack;
 
 template <class _Tp, class _Container>
 _LIBCPP_INLINE_VISIBILITY
@@ -104,7 +104,7 @@
 operator< (const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y);
 
 template <class _Tp, class _Container = deque<_Tp> >
-class _LIBCPP_VISIBLE stack
+class _LIBCPP_TYPE_VIS stack
 {
 public:
     typedef _Container                               container_type;
@@ -282,7 +282,7 @@
 }
 
 template <class _Tp, class _Container, class _Alloc>
-struct _LIBCPP_VISIBLE uses_allocator<stack<_Tp, _Container>, _Alloc>
+struct _LIBCPP_TYPE_VIS uses_allocator<stack<_Tp, _Container>, _Alloc>
     : public uses_allocator<_Container, _Alloc>
 {
 };
diff --git a/sources/cxx-stl/llvm-libc++/include/stdexcept b/sources/cxx-stl/llvm-libc++/libcxx/include/stdexcept
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/stdexcept
rename to sources/cxx-stl/llvm-libc++/libcxx/include/stdexcept
diff --git a/sources/cxx-stl/llvm-libc++/include/streambuf b/sources/cxx-stl/llvm-libc++/libcxx/include/streambuf
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/include/streambuf
rename to sources/cxx-stl/llvm-libc++/libcxx/include/streambuf
index d688024..8261594 100644
--- a/sources/cxx-stl/llvm-libc++/include/streambuf
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/streambuf
@@ -119,7 +119,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 template <class _CharT, class _Traits>
-class _LIBCPP_VISIBLE basic_streambuf
+class _LIBCPP_TYPE_VIS basic_streambuf
 {
 public:
     // types:
diff --git a/sources/cxx-stl/llvm-libc++/include/string b/sources/cxx-stl/llvm-libc++/libcxx/include/string
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/include/string
rename to sources/cxx-stl/llvm-libc++/libcxx/include/string
index 1a70467..85eb463 100644
--- a/sources/cxx-stl/llvm-libc++/include/string
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/string
@@ -457,7 +457,7 @@
 // fpos
 
 template <class _StateT>
-class _LIBCPP_VISIBLE fpos
+class _LIBCPP_TYPE_VIS fpos
 {
 private:
     _StateT __st_;
@@ -494,7 +494,7 @@
 // char_traits
 
 template <class _CharT>
-struct _LIBCPP_VISIBLE char_traits
+struct _LIBCPP_TYPE_VIS char_traits
 {
     typedef _CharT    char_type;
     typedef int       int_type;
@@ -620,7 +620,7 @@
 // char_traits<char>
 
 template <>
-struct _LIBCPP_VISIBLE char_traits<char>
+struct _LIBCPP_TYPE_VIS char_traits<char>
 {
     typedef char      char_type;
     typedef int       int_type;
@@ -676,7 +676,7 @@
 // char_traits<wchar_t>
 
 template <>
-struct _LIBCPP_VISIBLE char_traits<wchar_t>
+struct _LIBCPP_TYPE_VIS char_traits<wchar_t>
 {
     typedef wchar_t   char_type;
     typedef wint_t    int_type;
@@ -733,7 +733,7 @@
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
 
 template <>
-struct _LIBCPP_VISIBLE char_traits<char16_t>
+struct _LIBCPP_TYPE_VIS char_traits<char16_t>
 {
     typedef char16_t       char_type;
     typedef uint_least16_t int_type;
@@ -853,7 +853,7 @@
 }
 
 template <>
-struct _LIBCPP_VISIBLE char_traits<char32_t>
+struct _LIBCPP_TYPE_VIS char_traits<char32_t>
 {
     typedef char32_t       char_type;
     typedef uint_least32_t int_type;
@@ -1036,8 +1036,23 @@
 #pragma warning( pop )
 #endif // _MSC_VER
 
+#ifdef _LIBCPP_ALTERNATE_STRING_LAYOUT
+
+template <class _CharT, size_t = sizeof(_CharT)>
+struct __padding
+{
+    unsigned char __xx[sizeof(_CharT)-1];
+};
+
+template <class _CharT>
+struct __padding<_CharT, 1>
+{
+};
+
+#endif  // _LIBCPP_ALTERNATE_STRING_LAYOUT
+
 template<class _CharT, class _Traits, class _Allocator>
-class _LIBCPP_VISIBLE basic_string
+class _LIBCPP_TYPE_VIS basic_string
     : private __basic_string_common<true>
 {
 public:
@@ -1069,6 +1084,39 @@
     typedef _VSTD::reverse_iterator<const_iterator>       const_reverse_iterator;
 
 private:
+
+#ifdef _LIBCPP_ALTERNATE_STRING_LAYOUT
+
+    struct __long
+    {
+        pointer   __data_;
+        size_type __size_;
+        size_type __cap_;
+    };
+
+#if _LIBCPP_BIG_ENDIAN
+    enum {__short_mask = 0x01};
+    enum {__long_mask  = 0x1ul};
+#else  // _LIBCPP_BIG_ENDIAN
+    enum {__short_mask = 0x80};
+    enum {__long_mask  = ~(size_type(~0) >> 1)};
+#endif  // _LIBCPP_BIG_ENDIAN
+
+    enum {__min_cap = (sizeof(__long) - 1)/sizeof(value_type) > 2 ?
+                      (sizeof(__long) - 1)/sizeof(value_type) : 2};
+
+    struct __short
+    {
+        value_type __data_[__min_cap];
+        struct
+            : __padding<value_type>
+        {
+            unsigned char __size_;
+        };
+    };
+
+#else
+
     struct __long
     {
         size_type __cap_;
@@ -1084,8 +1132,6 @@
     enum {__long_mask  = 0x1ul};
 #endif  // _LIBCPP_BIG_ENDIAN
 
-    enum {__mask = size_type(~0) >> 1};
-
     enum {__min_cap = (sizeof(__long) - 1)/sizeof(value_type) > 2 ?
                       (sizeof(__long) - 1)/sizeof(value_type) : 2};
 
@@ -1099,6 +1145,8 @@
         value_type __data_[__min_cap];
     };
 
+#endif  // _LIBCPP_ALTERNATE_STRING_LAYOUT
+
     union __lx{__long __lx; __short __lxx;};
 
     enum {__n_words = sizeof(__lx) / sizeof(size_type)};
@@ -1462,6 +1510,11 @@
     int compare(size_type __pos1, size_type __n1, const_pointer __s, size_type __n2) const;
 
     _LIBCPP_INLINE_VISIBILITY bool __invariants() const;
+
+    _LIBCPP_INLINE_VISIBILITY
+    bool __is_long() const _NOEXCEPT
+        {return bool(__r_.first().__s.__size_ & __short_mask);}
+
 private:
     _LIBCPP_INLINE_VISIBILITY
     allocator_type& __alloc() _NOEXCEPT
@@ -1470,24 +1523,44 @@
     const allocator_type& __alloc() const _NOEXCEPT
         {return __r_.second();}
 
-    _LIBCPP_INLINE_VISIBILITY
-    bool __is_long() const _NOEXCEPT
-        {return bool(__r_.first().__s.__size_ & __short_mask);}
+#ifdef _LIBCPP_ALTERNATE_STRING_LAYOUT
 
     _LIBCPP_INLINE_VISIBILITY
     void __set_short_size(size_type __s) _NOEXCEPT
-#if _LIBCPP_BIG_ENDIAN
-        {__r_.first().__s.__size_ = (unsigned char)(__s);}
-#else
+#   if _LIBCPP_BIG_ENDIAN
         {__r_.first().__s.__size_ = (unsigned char)(__s << 1);}
-#endif
+#   else
+        {__r_.first().__s.__size_ = (unsigned char)(__s);}
+#   endif
+
     _LIBCPP_INLINE_VISIBILITY
     size_type __get_short_size() const _NOEXCEPT
-#if _LIBCPP_BIG_ENDIAN
-        {return __r_.first().__s.__size_;}
-#else
+#   if _LIBCPP_BIG_ENDIAN
         {return __r_.first().__s.__size_ >> 1;}
-#endif
+#   else
+        {return __r_.first().__s.__size_;}
+#   endif
+
+#else  // _LIBCPP_ALTERNATE_STRING_LAYOUT
+
+    _LIBCPP_INLINE_VISIBILITY
+    void __set_short_size(size_type __s) _NOEXCEPT
+#   if _LIBCPP_BIG_ENDIAN
+        {__r_.first().__s.__size_ = (unsigned char)(__s);}
+#   else
+        {__r_.first().__s.__size_ = (unsigned char)(__s << 1);}
+#   endif
+
+    _LIBCPP_INLINE_VISIBILITY
+    size_type __get_short_size() const _NOEXCEPT
+#   if _LIBCPP_BIG_ENDIAN
+        {return __r_.first().__s.__size_;}
+#   else
+        {return __r_.first().__s.__size_ >> 1;}
+#   endif
+
+#endif  // _LIBCPP_ALTERNATE_STRING_LAYOUT
+
     _LIBCPP_INLINE_VISIBILITY
     void __set_long_size(size_type __s) _NOEXCEPT
         {__r_.first().__l.__size_ = __s;}
@@ -2315,14 +2388,37 @@
 void
 basic_string<_CharT, _Traits, _Allocator>::push_back(value_type __c)
 {
-    size_type __cap = capacity();
-    size_type __sz = size();
+    bool __is_short = !__is_long();
+    size_type __cap;
+    size_type __sz;
+    if (__is_short)
+    {
+        __cap = __min_cap - 1;
+        __sz = __get_short_size();
+    }
+    else
+    {
+        __cap = __get_long_cap() - 1;
+        __sz = __get_long_size();
+    }
     if (__sz == __cap)
+    {
         __grow_by(__cap, 1, __sz, __sz, 0);
-    pointer __p = __get_pointer() + __sz;
+        __is_short = !__is_long();
+    }
+    pointer __p;
+    if (__is_short)
+    {
+        __p = __get_short_pointer() + __sz;
+        __set_short_size(__sz+1);
+    }
+    else
+    {
+        __p = __get_long_pointer() + __sz;
+        __set_long_size(__sz+1);
+    }
     traits_type::assign(*__p, __c);
     traits_type::assign(*++__p, value_type());
-    __set_size(__sz+1);
 }
 
 template <class _CharT, class _Traits, class _Allocator>
@@ -3561,9 +3657,29 @@
 operator==(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
            const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
 {
-    return __lhs.size() == __rhs.size() && _Traits::compare(__lhs.data(),
-                                                            __rhs.data(),
-                                                            __lhs.size()) == 0;
+    size_t __lhs_sz = __lhs.size();
+    return __lhs_sz == __rhs.size() && _Traits::compare(__lhs.data(),
+                                                        __rhs.data(),
+                                                        __lhs_sz) == 0;
+}
+
+template<class _Allocator>
+_LIBCPP_INLINE_VISIBILITY inline
+bool
+operator==(const basic_string<char, char_traits<char>, _Allocator>& __lhs,
+           const basic_string<char, char_traits<char>, _Allocator>& __rhs) _NOEXCEPT
+{
+    size_t __lhs_sz = __lhs.size();
+    if (__lhs_sz != __rhs.size())
+        return false;
+    const char* __lp = __lhs.data();
+    const char* __rp = __rhs.data();
+    if (__lhs.__is_long())
+        return char_traits<char>::compare(__lp, __rp, __lhs_sz) == 0;
+    for (; __lhs_sz != 0; --__lhs_sz, ++__lp, ++__rp)
+        if (*__lp != *__rp)
+            return false;
+    return true;
 }
 
 template<class _CharT, class _Traits, class _Allocator>
@@ -3923,7 +4039,7 @@
 }
 
 template<class _CharT, class _Traits, class _Allocator>
-struct _LIBCPP_VISIBLE hash<basic_string<_CharT, _Traits, _Allocator> >
+struct _LIBCPP_TYPE_VIS hash<basic_string<_CharT, _Traits, _Allocator> >
     : public unary_function<basic_string<_CharT, _Traits, _Allocator>, size_t>
 {
     size_t
diff --git a/sources/cxx-stl/llvm-libc++/include/strstream b/sources/cxx-stl/llvm-libc++/libcxx/include/strstream
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/strstream
rename to sources/cxx-stl/llvm-libc++/libcxx/include/strstream
index 5eadefd..81eef2a 100644
--- a/sources/cxx-stl/llvm-libc++/include/strstream
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/strstream
@@ -137,7 +137,7 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-class _LIBCPP_VISIBLE strstreambuf
+class _LIBCPP_TYPE_VIS strstreambuf
     : public streambuf
 {
 public:
@@ -228,7 +228,7 @@
 
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
-class _LIBCPP_VISIBLE istrstream
+class _LIBCPP_TYPE_VIS istrstream
     : public istream
 {
 public:
@@ -281,7 +281,7 @@
     strstreambuf __sb_;
 };
 
-class _LIBCPP_VISIBLE ostrstream
+class _LIBCPP_TYPE_VIS ostrstream
     : public ostream
 {
 public:
@@ -334,7 +334,7 @@
     strstreambuf __sb_; // exposition only
 };
 
-class _LIBCPP_VISIBLE strstream
+class _LIBCPP_TYPE_VIS strstream
     : public iostream
 {
 public:
diff --git a/sources/cxx-stl/llvm-libc++/include/support/solaris/floatingpoint.h b/sources/cxx-stl/llvm-libc++/libcxx/include/support/solaris/floatingpoint.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/solaris/floatingpoint.h
rename to sources/cxx-stl/llvm-libc++/libcxx/include/support/solaris/floatingpoint.h
diff --git a/sources/cxx-stl/llvm-libc++/include/support/solaris/wchar.h b/sources/cxx-stl/llvm-libc++/libcxx/include/support/solaris/wchar.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/solaris/wchar.h
rename to sources/cxx-stl/llvm-libc++/libcxx/include/support/solaris/wchar.h
diff --git a/sources/cxx-stl/llvm-libc++/include/support/solaris/xlocale.h b/sources/cxx-stl/llvm-libc++/libcxx/include/support/solaris/xlocale.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/solaris/xlocale.h
rename to sources/cxx-stl/llvm-libc++/libcxx/include/support/solaris/xlocale.h
diff --git a/sources/cxx-stl/llvm-libc++/include/support/win32/limits_win32.h b/sources/cxx-stl/llvm-libc++/libcxx/include/support/win32/limits_win32.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/win32/limits_win32.h
rename to sources/cxx-stl/llvm-libc++/libcxx/include/support/win32/limits_win32.h
diff --git a/sources/cxx-stl/llvm-libc++/include/support/win32/locale_win32.h b/sources/cxx-stl/llvm-libc++/libcxx/include/support/win32/locale_win32.h
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/include/support/win32/locale_win32.h
rename to sources/cxx-stl/llvm-libc++/libcxx/include/support/win32/locale_win32.h
index e035420..019586c 100644
--- a/sources/cxx-stl/llvm-libc++/include/support/win32/locale_win32.h
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/support/win32/locale_win32.h
@@ -65,8 +65,21 @@
 #define strtoull_l _strtoui64_l
 // FIXME: current msvcrt does not know about long double
 #define strtold_l _strtod_l
-#define islower_l _islower_l
-#define isupper_l _isupper_l
+
+inline _LIBCPP_INLINE_VISIBILITY
+int
+islower_l(int c, _locale_t loc)
+{
+ return _islower_l((int)c, loc);
+}
+
+inline _LIBCPP_INLINE_VISIBILITY
+int
+isupper_l(int c, _locale_t loc)
+{
+ return _isupper_l((int)c, loc);
+}
+
 #define isdigit_l _isdigit_l
 #define isxdigit_l _isxdigit_l
 #define strcoll_l _strcoll_l
diff --git a/sources/cxx-stl/llvm-libc++/include/support/win32/math_win32.h b/sources/cxx-stl/llvm-libc++/libcxx/include/support/win32/math_win32.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/win32/math_win32.h
rename to sources/cxx-stl/llvm-libc++/libcxx/include/support/win32/math_win32.h
diff --git a/sources/cxx-stl/llvm-libc++/include/support/win32/support.h b/sources/cxx-stl/llvm-libc++/libcxx/include/support/win32/support.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/support/win32/support.h
rename to sources/cxx-stl/llvm-libc++/libcxx/include/support/win32/support.h
diff --git a/sources/cxx-stl/llvm-libc++/include/system_error b/sources/cxx-stl/llvm-libc++/libcxx/include/system_error
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/include/system_error
rename to sources/cxx-stl/llvm-libc++/libcxx/include/system_error
index cbc52fb..1c1c7eb 100644
--- a/sources/cxx-stl/llvm-libc++/include/system_error
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/system_error
@@ -232,13 +232,13 @@
 // is_error_code_enum
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_error_code_enum
+struct _LIBCPP_TYPE_VIS is_error_code_enum
     : public false_type {};
 
 // is_error_condition_enum
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_error_condition_enum
+struct _LIBCPP_TYPE_VIS is_error_condition_enum
     : public false_type {};
 
 // Some error codes are not present on all platforms, so we provide equivalents
@@ -345,23 +345,23 @@
 _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(errc)
 
 template <>
-struct _LIBCPP_VISIBLE is_error_condition_enum<errc>
+struct _LIBCPP_TYPE_VIS is_error_condition_enum<errc>
     : true_type { };
 
 #ifdef _LIBCPP_HAS_NO_STRONG_ENUMS
 template <>
-struct _LIBCPP_VISIBLE is_error_condition_enum<errc::__lx>
+struct _LIBCPP_TYPE_VIS is_error_condition_enum<errc::__lx>
     : true_type { };
 #endif
 
-class _LIBCPP_VISIBLE error_condition;
-class _LIBCPP_VISIBLE error_code;
+class _LIBCPP_TYPE_VIS error_condition;
+class _LIBCPP_TYPE_VIS error_code;
 
 // class error_category
 
 class _LIBCPP_HIDDEN __do_message;
 
-class _LIBCPP_VISIBLE error_category
+class _LIBCPP_TYPE_VIS error_category
 {
 public:
     virtual ~error_category() _NOEXCEPT;
@@ -400,7 +400,7 @@
 const error_category& generic_category() _NOEXCEPT;
 const error_category& system_category() _NOEXCEPT;
 
-class _LIBCPP_VISIBLE error_condition
+class _LIBCPP_TYPE_VIS error_condition
 {
     int __val_;
     const error_category* __cat_;
@@ -472,7 +472,7 @@
 
 // error_code
 
-class _LIBCPP_VISIBLE error_code
+class _LIBCPP_TYPE_VIS error_code
 {
     int __val_;
     const error_category* __cat_;
@@ -597,7 +597,7 @@
 {return !(__x == __y);}
 
 template <>
-struct _LIBCPP_VISIBLE hash<error_code>
+struct _LIBCPP_TYPE_VIS hash<error_code>
     : public unary_function<error_code, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -609,7 +609,7 @@
 
 // system_error
 
-class _LIBCPP_VISIBLE system_error
+class _LIBCPP_TYPE_VIS system_error
     : public runtime_error
 {
     error_code __ec_;
diff --git a/sources/cxx-stl/llvm-libc++/include/tgmath.h b/sources/cxx-stl/llvm-libc++/libcxx/include/tgmath.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/tgmath.h
rename to sources/cxx-stl/llvm-libc++/libcxx/include/tgmath.h
diff --git a/sources/cxx-stl/llvm-libc++/include/thread b/sources/cxx-stl/llvm-libc++/libcxx/include/thread
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/include/thread
rename to sources/cxx-stl/llvm-libc++/libcxx/include/thread
index 60d8885..f41ea29 100644
--- a/sources/cxx-stl/llvm-libc++/include/thread
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/thread
@@ -144,9 +144,11 @@
 __thread_specific_ptr<_Tp>::__thread_specific_ptr()
 {
     int __ec = pthread_key_create(&__key_, &__thread_specific_ptr::__at_thread_exit);
+#ifndef _LIBCPP_NO_EXCEPTIONS
     if (__ec)
         throw system_error(error_code(__ec, system_category()),
                            "__thread_specific_ptr construction failed");
+#endif
 }
 
 template <class _Tp>
@@ -173,8 +175,8 @@
     delete __p_old;
 }
 
-class _LIBCPP_VISIBLE thread;
-class _LIBCPP_VISIBLE __thread_id;
+class _LIBCPP_TYPE_VIS thread;
+class _LIBCPP_TYPE_VIS __thread_id;
 
 namespace this_thread
 {
@@ -183,10 +185,10 @@
 
 }  // this_thread
 
-class _LIBCPP_VISIBLE __thread_id;
-template<> struct _LIBCPP_VISIBLE hash<__thread_id>;
+class _LIBCPP_TYPE_VIS __thread_id;
+template<> struct _LIBCPP_TYPE_VIS hash<__thread_id>;
 
-class _LIBCPP_VISIBLE __thread_id
+class _LIBCPP_TYPE_VIS __thread_id
 {
     // FIXME: pthread_t is a pointer on Darwin but a long on Linux.
     // NULL is the no-thread value on Darwin.  Someone needs to check
@@ -228,12 +230,12 @@
     __thread_id(pthread_t __id) : __id_(__id) {}
 
     friend __thread_id this_thread::get_id() _NOEXCEPT;
-    friend class _LIBCPP_VISIBLE thread;
-    friend struct _LIBCPP_VISIBLE hash<__thread_id>;
+    friend class _LIBCPP_TYPE_VIS thread;
+    friend struct _LIBCPP_TYPE_VIS hash<__thread_id>;
 };
 
 template<>
-struct _LIBCPP_VISIBLE hash<__thread_id>
+struct _LIBCPP_TYPE_VIS hash<__thread_id>
     : public unary_function<__thread_id, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
@@ -255,7 +257,7 @@
 
 }  // this_thread
 
-class _LIBCPP_VISIBLE thread
+class _LIBCPP_TYPE_VIS thread
 {
     pthread_t __t_;
 
@@ -326,7 +328,7 @@
 template <class _Fp, class ..._Args, size_t ..._Indices>
 inline _LIBCPP_INLINE_VISIBILITY
 void
-__threaad_execute(tuple<_Fp, _Args...>& __t, __tuple_indices<_Indices...>)
+__thread_execute(tuple<_Fp, _Args...>& __t, __tuple_indices<_Indices...>)
 {
     __invoke(_VSTD::move(_VSTD::get<0>(__t)), _VSTD::move(_VSTD::get<_Indices>(__t))...);
 }
@@ -338,7 +340,7 @@
     __thread_local_data().reset(new __thread_struct);
     std::unique_ptr<_Fp> __p(static_cast<_Fp*>(__vp));
     typedef typename __make_tuple_indices<tuple_size<_Fp>::value, 1>::type _Index;
-    __threaad_execute(*__p, _Index());
+    __thread_execute(*__p, _Index());
     return nullptr;
 }
 
diff --git a/sources/cxx-stl/llvm-libc++/include/tuple b/sources/cxx-stl/llvm-libc++/libcxx/include/tuple
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/tuple
rename to sources/cxx-stl/llvm-libc++/libcxx/include/tuple
index 3fa6730..0df315e 100644
--- a/sources/cxx-stl/llvm-libc++/include/tuple
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/tuple
@@ -128,7 +128,7 @@
 
 // allocator_arg_t
 
-struct _LIBCPP_VISIBLE allocator_arg_t { };
+struct _LIBCPP_TYPE_VIS allocator_arg_t { };
 
 #if defined(_LIBCPP_HAS_NO_CONSTEXPR) || defined(_LIBCPP_BUILDING_MEMORY)
 extern const allocator_arg_t allocator_arg;
@@ -163,7 +163,7 @@
 };
 
 template <class _Tp, class _Alloc>
-struct _LIBCPP_VISIBLE uses_allocator
+struct _LIBCPP_TYPE_VIS uses_allocator
     : public __uses_allocator<_Tp, _Alloc>
 {
 };
@@ -193,7 +193,7 @@
 // tuple_size
 
 template <class ..._Tp>
-class _LIBCPP_VISIBLE tuple_size<tuple<_Tp...> >
+class _LIBCPP_TYPE_VIS tuple_size<tuple<_Tp...> >
     : public integral_constant<size_t, sizeof...(_Tp)>
 {
 };
@@ -201,7 +201,7 @@
 // tuple_element
 
 template <size_t _Ip, class ..._Tp>
-class _LIBCPP_VISIBLE tuple_element<_Ip, tuple<_Tp...> >
+class _LIBCPP_TYPE_VIS tuple_element<_Ip, tuple<_Tp...> >
 {
 public:
     typedef typename tuple_element<_Ip, __tuple_types<_Tp...> >::type type;
@@ -477,7 +477,7 @@
     template <class _Tuple,
               class = typename enable_if
                       <
-                         __tuple_convertible<_Tuple, tuple<_Tp...> >::value
+                         __tuple_constructible<_Tuple, tuple<_Tp...> >::value
                       >::type
              >
         _LIBCPP_INLINE_VISIBILITY
@@ -533,7 +533,7 @@
 };
 
 template <class ..._Tp>
-class _LIBCPP_VISIBLE tuple
+class _LIBCPP_TYPE_VIS tuple
 {
     typedef __tuple_impl<typename __make_tuple_indices<sizeof...(_Tp)>::type, _Tp...> base;
 
@@ -721,7 +721,7 @@
 };
 
 template <>
-class _LIBCPP_VISIBLE tuple<>
+class _LIBCPP_TYPE_VIS tuple<>
 {
 public:
     _LIBCPP_INLINE_VISIBILITY
@@ -803,7 +803,7 @@
 
 namespace { const __ignore_t<unsigned char> ignore = __ignore_t<unsigned char>(); }
 
-template <class _Tp> class _LIBCPP_VISIBLE reference_wrapper;
+template <class _Tp> class _LIBCPP_TYPE_VIS reference_wrapper;
 
 template <class _Tp>
 struct ___make_tuple_return
@@ -1071,7 +1071,7 @@
 }
 
 template <class ..._Tp, class _Alloc>
-struct _LIBCPP_VISIBLE uses_allocator<tuple<_Tp...>, _Alloc>
+struct _LIBCPP_TYPE_VIS uses_allocator<tuple<_Tp...>, _Alloc>
     : true_type {};
 
 template <class _T1, class _T2>
diff --git a/sources/cxx-stl/llvm-libc++/include/type_traits b/sources/cxx-stl/llvm-libc++/libcxx/include/type_traits
similarity index 85%
rename from sources/cxx-stl/llvm-libc++/include/type_traits
rename to sources/cxx-stl/llvm-libc++/libcxx/include/type_traits
index 8f1c602..ab0e222 100644
--- a/sources/cxx-stl/llvm-libc++/include/type_traits
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/type_traits
@@ -129,6 +129,7 @@
     template <class T> struct alignment_of;
     template <size_t Len, size_t Align = most_stringent_alignment_requirement>
         struct aligned_storage;
+    template <size_t Len, class... Types> struct aligned_union;
 
     template <class T> struct decay;
     template <class... T> struct common_type;
@@ -149,19 +150,19 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 template <bool _Bp, class _If, class _Then>
-    struct _LIBCPP_VISIBLE conditional {typedef _If type;};
+    struct _LIBCPP_TYPE_VIS conditional {typedef _If type;};
 template <class _If, class _Then>
-    struct _LIBCPP_VISIBLE conditional<false, _If, _Then> {typedef _Then type;};
+    struct _LIBCPP_TYPE_VIS conditional<false, _If, _Then> {typedef _Then type;};
 
-template <bool, class _Tp = void> struct _LIBCPP_VISIBLE enable_if {};
-template <class _Tp> struct _LIBCPP_VISIBLE enable_if<true, _Tp> {typedef _Tp type;};
+template <bool, class _Tp = void> struct _LIBCPP_TYPE_VIS enable_if {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS enable_if<true, _Tp> {typedef _Tp type;};
 
 struct __two {char __lx[2];};
 
 // helper class:
 
 template <class _Tp, _Tp __v>
-struct _LIBCPP_VISIBLE integral_constant
+struct _LIBCPP_TYPE_VIS integral_constant
 {
     static _LIBCPP_CONSTEXPR const _Tp      value = __v;
     typedef _Tp               value_type;
@@ -178,27 +179,27 @@
 
 // is_const
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_const            : public false_type {};
-template <class _Tp> struct _LIBCPP_VISIBLE is_const<_Tp const> : public true_type {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_const            : public false_type {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_const<_Tp const> : public true_type {};
 
 // is_volatile
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_volatile               : public false_type {};
-template <class _Tp> struct _LIBCPP_VISIBLE is_volatile<_Tp volatile> : public true_type {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_volatile               : public false_type {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_volatile<_Tp volatile> : public true_type {};
 
 // remove_const
 
-template <class _Tp> struct _LIBCPP_VISIBLE remove_const            {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_VISIBLE remove_const<const _Tp> {typedef _Tp type;};
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_const            {typedef _Tp type;};
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_const<const _Tp> {typedef _Tp type;};
 
 // remove_volatile
 
-template <class _Tp> struct _LIBCPP_VISIBLE remove_volatile               {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_VISIBLE remove_volatile<volatile _Tp> {typedef _Tp type;};
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_volatile               {typedef _Tp type;};
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_volatile<volatile _Tp> {typedef _Tp type;};
 
 // remove_cv
 
-template <class _Tp> struct _LIBCPP_VISIBLE remove_cv
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_cv
 {typedef typename remove_volatile<typename remove_const<_Tp>::type>::type type;};
 
 // is_void
@@ -206,7 +207,7 @@
 template <class _Tp> struct __is_void       : public false_type {};
 template <>          struct __is_void<void> : public true_type {};
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_void
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_void
     : public __is_void<typename remove_cv<_Tp>::type> {};
 
 // __is_nullptr_t
@@ -214,7 +215,7 @@
 template <class _Tp> struct ____is_nullptr_t       : public false_type {};
 template <>          struct ____is_nullptr_t<nullptr_t> : public true_type {};
 
-template <class _Tp> struct _LIBCPP_VISIBLE __is_nullptr_t
+template <class _Tp> struct _LIBCPP_TYPE_VIS __is_nullptr_t
     : public ____is_nullptr_t<typename remove_cv<_Tp>::type> {};
 
 // is_integral
@@ -238,7 +239,7 @@
 template <>          struct __is_integral<long long>          : public true_type {};
 template <>          struct __is_integral<unsigned long long> : public true_type {};
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_integral
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_integral
     : public __is_integral<typename remove_cv<_Tp>::type> {};
 
 // is_floating_point
@@ -248,16 +249,16 @@
 template <>          struct __is_floating_point<double>      : public true_type {};
 template <>          struct __is_floating_point<long double> : public true_type {};
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_floating_point
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_floating_point
     : public __is_floating_point<typename remove_cv<_Tp>::type> {};
 
 // is_array
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_array
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_array
     : public false_type {};
-template <class _Tp> struct _LIBCPP_VISIBLE is_array<_Tp[]>
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_array<_Tp[]>
     : public true_type {};
-template <class _Tp, size_t _Np> struct _LIBCPP_VISIBLE is_array<_Tp[_Np]>
+template <class _Tp, size_t _Np> struct _LIBCPP_TYPE_VIS is_array<_Tp[_Np]>
     : public true_type {};
 
 // is_pointer
@@ -265,23 +266,23 @@
 template <class _Tp> struct __is_pointer       : public false_type {};
 template <class _Tp> struct __is_pointer<_Tp*> : public true_type {};
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_pointer
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_pointer
     : public __is_pointer<typename remove_cv<_Tp>::type> {};
 
 // is_reference
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_lvalue_reference       : public false_type {};
-template <class _Tp> struct _LIBCPP_VISIBLE is_lvalue_reference<_Tp&> : public true_type {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_lvalue_reference       : public false_type {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_lvalue_reference<_Tp&> : public true_type {};
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_rvalue_reference        : public false_type {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_rvalue_reference        : public false_type {};
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-template <class _Tp> struct _LIBCPP_VISIBLE is_rvalue_reference<_Tp&&> : public true_type {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_rvalue_reference<_Tp&&> : public true_type {};
 #endif
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_reference        : public false_type {};
-template <class _Tp> struct _LIBCPP_VISIBLE is_reference<_Tp&>  : public true_type {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_reference        : public false_type {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_reference<_Tp&>  : public true_type {};
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-template <class _Tp> struct _LIBCPP_VISIBLE is_reference<_Tp&&> : public true_type {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_reference<_Tp&&> : public true_type {};
 #endif
 
 #if defined(__clang__) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
@@ -292,13 +293,13 @@
 
 #if __has_feature(is_union) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_union
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_union
     : public integral_constant<bool, __is_union(_Tp)> {};
 
 #else
 
 template <class _Tp> struct __libcpp_union : public false_type {};
-template <class _Tp> struct _LIBCPP_VISIBLE is_union
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_union
     : public __libcpp_union<typename remove_cv<_Tp>::type> {};
 
 #endif
@@ -307,7 +308,7 @@
 
 #if __has_feature(is_class) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_class
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_class
     : public integral_constant<bool, __is_class(_Tp)> {};
 
 #else
@@ -318,15 +319,15 @@
 template <class _Tp> __two __test(...);
 }
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_class
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_class
     : public integral_constant<bool, sizeof(__is_class_imp::__test<_Tp>(0)) == 1 && !is_union<_Tp>::value> {};
 
 #endif
 
 // is_same
 
-template <class _Tp, class _Up> struct _LIBCPP_VISIBLE is_same           : public false_type {};
-template <class _Tp>            struct _LIBCPP_VISIBLE is_same<_Tp, _Tp> : public true_type {};
+template <class _Tp, class _Up> struct _LIBCPP_TYPE_VIS is_same           : public false_type {};
+template <class _Tp>            struct _LIBCPP_TYPE_VIS is_same<_Tp, _Tp> : public true_type {};
 
 // is_function
 
@@ -347,7 +348,7 @@
     {};
 template <class _Tp> struct __is_function<_Tp, true> : public false_type {};
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_function
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_function
     : public __is_function<_Tp> {};
 
 // is_member_function_pointer
@@ -355,7 +356,7 @@
 template <class _Tp> struct            __is_member_function_pointer             : public false_type {};
 template <class _Tp, class _Up> struct __is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {};
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_member_function_pointer
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_member_function_pointer
     : public __is_member_function_pointer<typename remove_cv<_Tp>::type> {};
 
 // is_member_pointer
@@ -363,12 +364,12 @@
 template <class _Tp>            struct __is_member_pointer             : public false_type {};
 template <class _Tp, class _Up> struct __is_member_pointer<_Tp _Up::*> : public true_type {};
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_member_pointer
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_member_pointer
     : public __is_member_pointer<typename remove_cv<_Tp>::type> {};
 
 // is_member_object_pointer
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_member_object_pointer
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_member_object_pointer
     : public integral_constant<bool, is_member_pointer<_Tp>::value &&
                                     !is_member_function_pointer<_Tp>::value> {};
 
@@ -376,12 +377,12 @@
 
 #if __has_feature(is_enum) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_enum
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_enum
     : public integral_constant<bool, __is_enum(_Tp)> {};
 
 #else
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_enum
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_enum
     : public integral_constant<bool, !is_void<_Tp>::value             &&
                                      !is_integral<_Tp>::value         &&
                                      !is_floating_point<_Tp>::value   &&
@@ -397,31 +398,31 @@
 
 // is_arithmetic
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_arithmetic
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_arithmetic
     : public integral_constant<bool, is_integral<_Tp>::value      ||
                                      is_floating_point<_Tp>::value> {};
 
 // is_fundamental
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_fundamental
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_fundamental
     : public integral_constant<bool, is_void<_Tp>::value        ||
                                      __is_nullptr_t<_Tp>::value ||
                                      is_arithmetic<_Tp>::value> {};
 
 // is_scalar
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_scalar
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_scalar
     : public integral_constant<bool, is_arithmetic<_Tp>::value     ||
                                      is_member_pointer<_Tp>::value ||
                                      is_pointer<_Tp>::value        ||
                                      __is_nullptr_t<_Tp>::value    ||
                                      is_enum<_Tp>::value           > {};
 
-template <> struct _LIBCPP_VISIBLE is_scalar<nullptr_t> : public true_type {};
+template <> struct _LIBCPP_TYPE_VIS is_scalar<nullptr_t> : public true_type {};
 
 // is_object
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_object
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_object
     : public integral_constant<bool, is_scalar<_Tp>::value ||
                                      is_array<_Tp>::value  ||
                                      is_union<_Tp>::value  ||
@@ -429,7 +430,7 @@
 
 // is_compound
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_compound
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_compound
     : public integral_constant<bool, !is_fundamental<_Tp>::value> {};
 
 // add_const
@@ -442,7 +443,7 @@
 template <class _Tp>
 struct __add_const<_Tp, false> {typedef const _Tp type;};
 
-template <class _Tp> struct _LIBCPP_VISIBLE add_const
+template <class _Tp> struct _LIBCPP_TYPE_VIS add_const
     {typedef typename __add_const<_Tp>::type type;};
 
 // add_volatile
@@ -455,38 +456,38 @@
 template <class _Tp>
 struct __add_volatile<_Tp, false> {typedef volatile _Tp type;};
 
-template <class _Tp> struct _LIBCPP_VISIBLE add_volatile
+template <class _Tp> struct _LIBCPP_TYPE_VIS add_volatile
     {typedef typename __add_volatile<_Tp>::type type;};
 
 // add_cv
 
-template <class _Tp> struct _LIBCPP_VISIBLE add_cv
+template <class _Tp> struct _LIBCPP_TYPE_VIS add_cv
     {typedef typename add_const<typename add_volatile<_Tp>::type>::type type;};
 
 // remove_reference
 
-template <class _Tp> struct _LIBCPP_VISIBLE remove_reference        {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_VISIBLE remove_reference<_Tp&>  {typedef _Tp type;};
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_reference        {typedef _Tp type;};
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_reference<_Tp&>  {typedef _Tp type;};
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-template <class _Tp> struct _LIBCPP_VISIBLE remove_reference<_Tp&&> {typedef _Tp type;};
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_reference<_Tp&&> {typedef _Tp type;};
 #endif
 
 // add_lvalue_reference
 
-template <class _Tp> struct _LIBCPP_VISIBLE add_lvalue_reference                      {typedef _Tp& type;};
-template <class _Tp> struct _LIBCPP_VISIBLE add_lvalue_reference<_Tp&>                {typedef _Tp& type;};  // for older compiler
-template <>          struct _LIBCPP_VISIBLE add_lvalue_reference<void>                {typedef void type;};
-template <>          struct _LIBCPP_VISIBLE add_lvalue_reference<const void>          {typedef const void type;};
-template <>          struct _LIBCPP_VISIBLE add_lvalue_reference<volatile void>       {typedef volatile void type;};
-template <>          struct _LIBCPP_VISIBLE add_lvalue_reference<const volatile void> {typedef const volatile void type;};
+template <class _Tp> struct _LIBCPP_TYPE_VIS add_lvalue_reference                      {typedef _Tp& type;};
+template <class _Tp> struct _LIBCPP_TYPE_VIS add_lvalue_reference<_Tp&>                {typedef _Tp& type;};  // for older compiler
+template <>          struct _LIBCPP_TYPE_VIS add_lvalue_reference<void>                {typedef void type;};
+template <>          struct _LIBCPP_TYPE_VIS add_lvalue_reference<const void>          {typedef const void type;};
+template <>          struct _LIBCPP_TYPE_VIS add_lvalue_reference<volatile void>       {typedef volatile void type;};
+template <>          struct _LIBCPP_TYPE_VIS add_lvalue_reference<const volatile void> {typedef const volatile void type;};
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
-template <class _Tp> struct _LIBCPP_VISIBLE  add_rvalue_reference                     {typedef _Tp&& type;};
-template <>          struct _LIBCPP_VISIBLE add_rvalue_reference<void>                {typedef void type;};
-template <>          struct _LIBCPP_VISIBLE add_rvalue_reference<const void>          {typedef const void type;};
-template <>          struct _LIBCPP_VISIBLE add_rvalue_reference<volatile void>       {typedef volatile void type;};
-template <>          struct _LIBCPP_VISIBLE add_rvalue_reference<const volatile void> {typedef const volatile void type;};
+template <class _Tp> struct _LIBCPP_TYPE_VIS  add_rvalue_reference                     {typedef _Tp&& type;};
+template <>          struct _LIBCPP_TYPE_VIS add_rvalue_reference<void>                {typedef void type;};
+template <>          struct _LIBCPP_TYPE_VIS add_rvalue_reference<const void>          {typedef const void type;};
+template <>          struct _LIBCPP_TYPE_VIS add_rvalue_reference<volatile void>       {typedef volatile void type;};
+template <>          struct _LIBCPP_TYPE_VIS add_rvalue_reference<const volatile void> {typedef const volatile void type;};
 
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
@@ -511,15 +512,15 @@
 
 // remove_pointer
 
-template <class _Tp> struct _LIBCPP_VISIBLE remove_pointer                      {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_VISIBLE remove_pointer<_Tp*>                {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_VISIBLE remove_pointer<_Tp* const>          {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_VISIBLE remove_pointer<_Tp* volatile>       {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_VISIBLE remove_pointer<_Tp* const volatile> {typedef _Tp type;};
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_pointer                      {typedef _Tp type;};
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_pointer<_Tp*>                {typedef _Tp type;};
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_pointer<_Tp* const>          {typedef _Tp type;};
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_pointer<_Tp* volatile>       {typedef _Tp type;};
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_pointer<_Tp* const volatile> {typedef _Tp type;};
 
 // add_pointer
 
-template <class _Tp> struct _LIBCPP_VISIBLE add_pointer
+template <class _Tp> struct _LIBCPP_TYPE_VIS add_pointer
     {typedef typename remove_reference<_Tp>::type* type;};
 
 // is_signed
@@ -535,7 +536,7 @@
 
 template <class _Tp> struct __is_signed<_Tp, false> : public false_type {};
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_signed : public __is_signed<_Tp> {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_signed : public __is_signed<_Tp> {};
 
 // is_unsigned
 
@@ -550,46 +551,46 @@
 
 template <class _Tp> struct __is_unsigned<_Tp, false> : public false_type {};
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_unsigned : public __is_unsigned<_Tp> {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_unsigned : public __is_unsigned<_Tp> {};
 
 // rank
 
-template <class _Tp> struct _LIBCPP_VISIBLE rank
+template <class _Tp> struct _LIBCPP_TYPE_VIS rank
     : public integral_constant<size_t, 0> {};
-template <class _Tp> struct _LIBCPP_VISIBLE rank<_Tp[]>
+template <class _Tp> struct _LIBCPP_TYPE_VIS rank<_Tp[]>
     : public integral_constant<size_t, rank<_Tp>::value + 1> {};
-template <class _Tp, size_t _Np> struct _LIBCPP_VISIBLE rank<_Tp[_Np]>
+template <class _Tp, size_t _Np> struct _LIBCPP_TYPE_VIS rank<_Tp[_Np]>
     : public integral_constant<size_t, rank<_Tp>::value + 1> {};
 
 // extent
 
-template <class _Tp, unsigned _Ip = 0> struct _LIBCPP_VISIBLE extent
+template <class _Tp, unsigned _Ip = 0> struct _LIBCPP_TYPE_VIS extent
     : public integral_constant<size_t, 0> {};
-template <class _Tp> struct _LIBCPP_VISIBLE extent<_Tp[], 0>
+template <class _Tp> struct _LIBCPP_TYPE_VIS extent<_Tp[], 0>
     : public integral_constant<size_t, 0> {};
-template <class _Tp, unsigned _Ip> struct _LIBCPP_VISIBLE extent<_Tp[], _Ip>
+template <class _Tp, unsigned _Ip> struct _LIBCPP_TYPE_VIS extent<_Tp[], _Ip>
     : public integral_constant<size_t, extent<_Tp, _Ip-1>::value> {};
-template <class _Tp, size_t _Np> struct _LIBCPP_VISIBLE extent<_Tp[_Np], 0>
+template <class _Tp, size_t _Np> struct _LIBCPP_TYPE_VIS extent<_Tp[_Np], 0>
     : public integral_constant<size_t, _Np> {};
-template <class _Tp, size_t _Np, unsigned _Ip> struct _LIBCPP_VISIBLE extent<_Tp[_Np], _Ip>
+template <class _Tp, size_t _Np, unsigned _Ip> struct _LIBCPP_TYPE_VIS extent<_Tp[_Np], _Ip>
     : public integral_constant<size_t, extent<_Tp, _Ip-1>::value> {};
 
 // remove_extent
 
-template <class _Tp> struct _LIBCPP_VISIBLE remove_extent
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_extent
     {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_VISIBLE remove_extent<_Tp[]>
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_extent<_Tp[]>
     {typedef _Tp type;};
-template <class _Tp, size_t _Np> struct _LIBCPP_VISIBLE remove_extent<_Tp[_Np]>
+template <class _Tp, size_t _Np> struct _LIBCPP_TYPE_VIS remove_extent<_Tp[_Np]>
     {typedef _Tp type;};
 
 // remove_all_extents
 
-template <class _Tp> struct _LIBCPP_VISIBLE remove_all_extents
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_all_extents
     {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_VISIBLE remove_all_extents<_Tp[]>
+template <class _Tp> struct _LIBCPP_TYPE_VIS remove_all_extents<_Tp[]>
     {typedef typename remove_all_extents<_Tp>::type type;};
-template <class _Tp, size_t _Np> struct _LIBCPP_VISIBLE remove_all_extents<_Tp[_Np]>
+template <class _Tp, size_t _Np> struct _LIBCPP_TYPE_VIS remove_all_extents<_Tp[_Np]>
     {typedef typename remove_all_extents<_Tp>::type type;};
 
 // is_abstract
@@ -605,14 +606,14 @@
 
 template <class _Tp> struct __libcpp_abstract<_Tp, false> : public false_type {};
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_abstract : public __libcpp_abstract<_Tp> {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_abstract : public __libcpp_abstract<_Tp> {};
 
 // is_base_of
 
 #ifdef _LIBCP_HAS_IS_BASE_OF
 
 template <class _Bp, class _Dp>
-struct _LIBCPP_VISIBLE is_base_of
+struct _LIBCPP_TYPE_VIS is_base_of
     : public integral_constant<bool, __is_base_of(_Bp, _Dp)> {};
 
 #else  // __has_feature(is_base_of)
@@ -636,7 +637,7 @@
 }
 
 template <class _Bp, class _Dp>
-struct _LIBCPP_VISIBLE is_base_of
+struct _LIBCPP_TYPE_VIS is_base_of
     : public integral_constant<bool, is_class<_Bp>::value &&
                                      sizeof(__is_base_of_imp::__test<_Bp, _Dp>(0)) == 2> {};
 
@@ -646,7 +647,7 @@
 
 #if __has_feature(is_convertible_to)
 
-template <class _T1, class _T2> struct _LIBCPP_VISIBLE is_convertible
+template <class _T1, class _T2> struct _LIBCPP_TYPE_VIS is_convertible
     : public integral_constant<bool, __is_convertible_to(_T1, _T2) &&
                                      !is_abstract<_T2>::value> {};
 
@@ -752,7 +753,7 @@
 template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 2, 3> : public false_type {};
 template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 3, 3> : public true_type {};
 
-template <class _T1, class _T2> struct _LIBCPP_VISIBLE is_convertible
+template <class _T1, class _T2> struct _LIBCPP_TYPE_VIS is_convertible
     : public __is_convertible<_T1, _T2>
 {
     static const size_t __complete_check1 = __is_convertible_check<_T1>::__v;
@@ -766,7 +767,7 @@
 #if __has_feature(is_empty)
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_empty
+struct _LIBCPP_TYPE_VIS is_empty
     : public integral_constant<bool, __is_empty(_Tp)> {};
 
 #else  // __has_feature(is_empty)
@@ -788,7 +789,7 @@
 
 template <class _Tp> struct __libcpp_empty<_Tp, false> : public false_type {};
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_empty : public __libcpp_empty<_Tp> {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_empty : public __libcpp_empty<_Tp> {};
 
 #endif  // __has_feature(is_empty)
 
@@ -797,22 +798,18 @@
 #if __has_feature(is_polymorphic)
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_polymorphic
+struct _LIBCPP_TYPE_VIS is_polymorphic
     : public integral_constant<bool, __is_polymorphic(_Tp)> {};
 
 #else
 
-template <class _Tp> struct __is_polymorphic1 : public _Tp {};
-template <class _Tp> struct __is_polymorphic2 : public _Tp {virtual ~__is_polymorphic2() throw();};
+template<typename _Tp> char &__is_polymorphic_impl(
+    typename enable_if<sizeof((_Tp*)dynamic_cast<const volatile void*>(declval<_Tp*>())) != 0,
+                       int>::type);
+template<typename _Tp> __two &__is_polymorphic_impl(...);
 
-template <class _Tp, bool = is_class<_Tp>::value>
-struct __libcpp_polymorphic
-    : public integral_constant<bool, sizeof(__is_polymorphic1<_Tp>) == sizeof(__is_polymorphic2<_Tp>)> {};
-
-template <class _Tp> struct __libcpp_polymorphic<_Tp, false> : public false_type {};
-
-template <class _Tp> struct _LIBCPP_VISIBLE is_polymorphic
-    : public __libcpp_polymorphic<_Tp> {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_polymorphic
+    : public integral_constant<bool, sizeof(__is_polymorphic_impl<_Tp>(0)) == 1> {};
 
 #endif // __has_feature(is_polymorphic)
 
@@ -820,22 +817,20 @@
 
 #if __has_feature(has_virtual_destructor) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
 
-template <class _Tp> struct _LIBCPP_VISIBLE has_virtual_destructor
+template <class _Tp> struct _LIBCPP_TYPE_VIS has_virtual_destructor
     : public integral_constant<bool, __has_virtual_destructor(_Tp)> {};
 
 #else  // _LIBCPP_HAS_TYPE_TRAITS
 
-template <class _Tp> struct _LIBCPP_VISIBLE has_virtual_destructor
+template <class _Tp> struct _LIBCPP_TYPE_VIS has_virtual_destructor
     : public false_type {};
 
 #endif  // _LIBCPP_HAS_TYPE_TRAITS
 
 // alignment_of
 
-template <class _Tp> struct __alignment_of {_Tp __lx;};
-
-template <class _Tp> struct _LIBCPP_VISIBLE alignment_of
-    : public integral_constant<size_t, __alignof__(__alignment_of<typename remove_all_extents<_Tp>::type>)> {};
+template <class _Tp> struct _LIBCPP_TYPE_VIS alignment_of
+    : public integral_constant<size_t, __alignof__(_Tp)> {};
 
 // aligned_storage
 
@@ -922,7 +917,7 @@
     : public integral_constant<size_t, __select_align<_Len, _Hp::value, __find_max_align<_Tp, _Len>::value>::value> {};
 
 template <size_t _Len, const size_t _Align = __find_max_align<__all_types, _Len>::value>
-struct _LIBCPP_VISIBLE aligned_storage
+struct _LIBCPP_TYPE_VIS aligned_storage
 {
     typedef typename __find_pod<__all_types, _Align>::type _Aligner;
     static_assert(!is_void<_Aligner>::value, "");
@@ -935,7 +930,7 @@
 
 #define _CREATE_ALIGNED_STORAGE_SPECIALIZATION(n) \
 template <size_t _Len>\
-struct _LIBCPP_VISIBLE aligned_storage<_Len, n>\
+struct _LIBCPP_TYPE_VIS aligned_storage<_Len, n>\
 {\
     struct _ALIGNAS(n) type\
     {\
@@ -964,6 +959,38 @@
 
 #undef _CREATE_ALIGNED_STORAGE_SPECIALIZATION
 
+#ifndef _LIBCPP_HAS_NO_VARIADICS
+
+// aligned_union
+
+template <size_t _I0, size_t ..._In>
+struct __static_max;
+
+template <size_t _I0>
+struct __static_max<_I0>
+{
+    static const size_t value = _I0;
+};
+
+template <size_t _I0, size_t _I1, size_t ..._In>
+struct __static_max<_I0, _I1, _In...>
+{
+    static const size_t value = _I0 >= _I1 ? __static_max<_I0, _In...>::value :
+                                             __static_max<_I1, _In...>::value;
+};
+
+template <size_t _Len, class _Type0, class ..._Types>
+struct aligned_union
+{
+    static const size_t alignment_value = __static_max<__alignof__(_Type0),
+                                                       __alignof__(_Types)...>::value;
+    static const size_t __len = __static_max<_Len, sizeof(_Type0),
+                                             sizeof(_Types)...>::value;
+    typedef typename aligned_storage<__len, alignment_value>::type type;
+};
+
+#endif  // _LIBCPP_HAS_NO_VARIADICS
+
 // __promote
 
 template <class _A1, class _A2 = void, class _A3 = void,
@@ -1118,7 +1145,7 @@
 template <> struct __make_signed<unsigned long long, true> {typedef long long type;};
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE make_signed
+struct _LIBCPP_TYPE_VIS make_signed
 {
     typedef typename __apply_cv<_Tp, typename __make_signed<typename remove_cv<_Tp>::type>::type>::type type;
 };
@@ -1143,7 +1170,7 @@
 template <> struct __make_unsigned<unsigned long long, true> {typedef unsigned long long type;};
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE make_unsigned
+struct _LIBCPP_TYPE_VIS make_unsigned
 {
     typedef typename __apply_cv<_Tp, typename __make_unsigned<typename remove_cv<_Tp>::type>::type>::type type;
 };
@@ -1151,21 +1178,21 @@
 #ifdef _LIBCPP_HAS_NO_VARIADICS
 
 template <class _Tp, class _Up = void, class V = void>
-struct _LIBCPP_VISIBLE common_type
+struct _LIBCPP_TYPE_VIS common_type
 {
 public:
     typedef typename common_type<typename common_type<_Tp, _Up>::type, V>::type type;
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE common_type<_Tp, void, void>
+struct _LIBCPP_TYPE_VIS common_type<_Tp, void, void>
 {
 public:
     typedef _Tp type;
 };
 
 template <class _Tp, class _Up>
-struct _LIBCPP_VISIBLE common_type<_Tp, _Up, void>
+struct _LIBCPP_TYPE_VIS common_type<_Tp, _Up, void>
 {
 private:
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
@@ -1184,13 +1211,13 @@
 template <class ..._Tp> struct common_type;
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE common_type<_Tp>
+struct _LIBCPP_TYPE_VIS common_type<_Tp>
 {
     typedef _Tp type;
 };
 
 template <class _Tp, class _Up>
-struct _LIBCPP_VISIBLE common_type<_Tp, _Up>
+struct _LIBCPP_TYPE_VIS common_type<_Tp, _Up>
 {
 private:
     static _Tp&& __t();
@@ -1201,7 +1228,7 @@
 };
 
 template <class _Tp, class _Up, class ..._Vp>
-struct _LIBCPP_VISIBLE common_type<_Tp, _Up, _Vp...>
+struct _LIBCPP_TYPE_VIS common_type<_Tp, _Up, _Vp...>
 {
     typedef typename common_type<typename common_type<_Tp, _Up>::type, _Vp...>::type type;
 };
@@ -1245,13 +1272,13 @@
 
 // is_copy_assignable
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_copy_assignable
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_copy_assignable
     : public is_assignable<typename add_lvalue_reference<_Tp>::type,
                      const typename add_lvalue_reference<_Tp>::type> {};
 
 // is_move_assignable
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_move_assignable
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_move_assignable
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
     : public is_assignable<typename add_lvalue_reference<_Tp>::type,
                      const typename add_rvalue_reference<_Tp>::type> {};
@@ -1366,7 +1393,7 @@
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE decay
+struct _LIBCPP_TYPE_VIS decay
 {
 private:
     typedef typename remove_reference<_Tp>::type _Up;
@@ -1745,7 +1772,7 @@
 // result_of
 
 template <class _Fn>
-class _LIBCPP_VISIBLE result_of<_Fn()>
+class _LIBCPP_TYPE_VIS result_of<_Fn()>
     : public __result_of<_Fn(),
                          is_class<typename remove_reference<_Fn>::type>::value ||
                          is_function<typename remove_reference<_Fn>::type>::value,
@@ -1755,7 +1782,7 @@
 };
 
 template <class _Fn, class _A0>
-class _LIBCPP_VISIBLE result_of<_Fn(_A0)>
+class _LIBCPP_TYPE_VIS result_of<_Fn(_A0)>
     : public __result_of<_Fn(_A0),
                          is_class<typename remove_reference<_Fn>::type>::value ||
                          is_function<typename remove_reference<_Fn>::type>::value,
@@ -1765,7 +1792,7 @@
 };
 
 template <class _Fn, class _A0, class _A1>
-class _LIBCPP_VISIBLE result_of<_Fn(_A0, _A1)>
+class _LIBCPP_TYPE_VIS result_of<_Fn(_A0, _A1)>
     : public __result_of<_Fn(_A0, _A1),
                          is_class<typename remove_reference<_Fn>::type>::value ||
                          is_function<typename remove_reference<_Fn>::type>::value,
@@ -1775,7 +1802,7 @@
 };
 
 template <class _Fn, class _A0, class _A1, class _A2>
-class _LIBCPP_VISIBLE result_of<_Fn(_A0, _A1, _A2)>
+class _LIBCPP_TYPE_VIS result_of<_Fn(_A0, _A1, _A2)>
     : public __result_of<_Fn(_A0, _A1, _A2),
                          is_class<typename remove_reference<_Fn>::type>::value ||
                          is_function<typename remove_reference<_Fn>::type>::value,
@@ -1880,7 +1907,7 @@
 //      is_constructible entry point
 
 template <class _Tp, class... _Args>
-struct _LIBCPP_VISIBLE is_constructible
+struct _LIBCPP_TYPE_VIS is_constructible
     : public __is_constructible_void_check<__contains_void<_Tp, _Args...>::value
                                         || is_abstract<_Tp>::value,
                                            _Tp, _Args...>
@@ -2028,7 +2055,7 @@
 
 template <class _Tp, class _A0 = __is_construct::__nat,
                      class _A1 = __is_construct::__nat>
-struct _LIBCPP_VISIBLE is_constructible
+struct _LIBCPP_TYPE_VIS is_constructible
     : public __is_constructible2_void_check<is_void<_Tp>::value
                                         || is_abstract<_Tp>::value
                                         || is_function<_Tp>::value
@@ -2038,7 +2065,7 @@
     {};
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_constructible<_Tp, __is_construct::__nat, __is_construct::__nat>
+struct _LIBCPP_TYPE_VIS is_constructible<_Tp, __is_construct::__nat, __is_construct::__nat>
     : public __is_constructible0_void_check<is_void<_Tp>::value
                                         || is_abstract<_Tp>::value
                                         || is_function<_Tp>::value,
@@ -2046,7 +2073,7 @@
     {};
 
 template <class _Tp, class _A0>
-struct _LIBCPP_VISIBLE is_constructible<_Tp, _A0, __is_construct::__nat>
+struct _LIBCPP_TYPE_VIS is_constructible<_Tp, _A0, __is_construct::__nat>
     : public __is_constructible1_void_check<is_void<_Tp>::value
                                         || is_abstract<_Tp>::value
                                         || is_function<_Tp>::value
@@ -2094,21 +2121,21 @@
 // is_default_constructible
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_default_constructible
+struct _LIBCPP_TYPE_VIS is_default_constructible
     : public is_constructible<_Tp>
     {};
 
 // is_copy_constructible
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_copy_constructible
+struct _LIBCPP_TYPE_VIS is_copy_constructible
     : public is_constructible<_Tp, const typename add_lvalue_reference<_Tp>::type>
     {};
 
 // is_move_constructible
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_move_constructible
+struct _LIBCPP_TYPE_VIS is_move_constructible
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
     : public is_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>
 #else
@@ -2123,7 +2150,7 @@
 #if __has_feature(is_trivially_constructible)
 
 template <class _Tp, class... _Args>
-struct _LIBCPP_VISIBLE is_trivially_constructible
+struct _LIBCPP_TYPE_VIS is_trivially_constructible
     : integral_constant<bool, __is_trivially_constructible(_Tp, _Args...)>
 {
 };
@@ -2131,13 +2158,13 @@
 #else  // !__has_feature(is_trivially_constructible)
 
 template <class _Tp, class... _Args>
-struct _LIBCPP_VISIBLE is_trivially_constructible
+struct _LIBCPP_TYPE_VIS is_trivially_constructible
     : false_type
 {
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_trivially_constructible<_Tp>
+struct _LIBCPP_TYPE_VIS is_trivially_constructible<_Tp>
 #if __has_feature(has_trivial_constructor) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
     : integral_constant<bool, __has_trivial_constructor(_Tp)>
 #else
@@ -2148,22 +2175,22 @@
 
 template <class _Tp>
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-struct _LIBCPP_VISIBLE is_trivially_constructible<_Tp, _Tp&&>
+struct _LIBCPP_TYPE_VIS is_trivially_constructible<_Tp, _Tp&&>
 #else
-struct _LIBCPP_VISIBLE is_trivially_constructible<_Tp, _Tp>
+struct _LIBCPP_TYPE_VIS is_trivially_constructible<_Tp, _Tp>
 #endif
     : integral_constant<bool, is_scalar<_Tp>::value>
 {
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_trivially_constructible<_Tp, const _Tp&>
+struct _LIBCPP_TYPE_VIS is_trivially_constructible<_Tp, const _Tp&>
     : integral_constant<bool, is_scalar<_Tp>::value>
 {
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_trivially_constructible<_Tp, _Tp&>
+struct _LIBCPP_TYPE_VIS is_trivially_constructible<_Tp, _Tp&>
     : integral_constant<bool, is_scalar<_Tp>::value>
 {
 };
@@ -2174,7 +2201,7 @@
 
 template <class _Tp, class _A0 = __is_construct::__nat,
                      class _A1 = __is_construct::__nat>
-struct _LIBCPP_VISIBLE is_trivially_constructible
+struct _LIBCPP_TYPE_VIS is_trivially_constructible
     : false_type
 {
 };
@@ -2182,28 +2209,28 @@
 #if __has_feature(is_trivially_constructible)
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_trivially_constructible<_Tp, __is_construct::__nat,
+struct _LIBCPP_TYPE_VIS is_trivially_constructible<_Tp, __is_construct::__nat,
                                                        __is_construct::__nat>
     : integral_constant<bool, __is_trivially_constructible(_Tp)>
 {
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_trivially_constructible<_Tp, _Tp,
+struct _LIBCPP_TYPE_VIS is_trivially_constructible<_Tp, _Tp,
                                                        __is_construct::__nat>
     : integral_constant<bool, __is_trivially_constructible(_Tp, _Tp)>
 {
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_trivially_constructible<_Tp, const _Tp&,
+struct _LIBCPP_TYPE_VIS is_trivially_constructible<_Tp, const _Tp&,
                                                        __is_construct::__nat>
     : integral_constant<bool, __is_trivially_constructible(_Tp, const _Tp&)>
 {
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_trivially_constructible<_Tp, _Tp&,
+struct _LIBCPP_TYPE_VIS is_trivially_constructible<_Tp, _Tp&,
                                                        __is_construct::__nat>
     : integral_constant<bool, __is_trivially_constructible(_Tp, _Tp&)>
 {
@@ -2212,28 +2239,28 @@
 #else  // !__has_feature(is_trivially_constructible)
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_trivially_constructible<_Tp, __is_construct::__nat,
+struct _LIBCPP_TYPE_VIS is_trivially_constructible<_Tp, __is_construct::__nat,
                                                        __is_construct::__nat>
     : integral_constant<bool, is_scalar<_Tp>::value>
 {
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_trivially_constructible<_Tp, _Tp,
+struct _LIBCPP_TYPE_VIS is_trivially_constructible<_Tp, _Tp,
                                                        __is_construct::__nat>
     : integral_constant<bool, is_scalar<_Tp>::value>
 {
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_trivially_constructible<_Tp, const _Tp&,
+struct _LIBCPP_TYPE_VIS is_trivially_constructible<_Tp, const _Tp&,
                                                        __is_construct::__nat>
     : integral_constant<bool, is_scalar<_Tp>::value>
 {
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_trivially_constructible<_Tp, _Tp&,
+struct _LIBCPP_TYPE_VIS is_trivially_constructible<_Tp, _Tp&,
                                                        __is_construct::__nat>
     : integral_constant<bool, is_scalar<_Tp>::value>
 {
@@ -2245,19 +2272,19 @@
 
 // is_trivially_default_constructible
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_trivially_default_constructible
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_trivially_default_constructible
     : public is_trivially_constructible<_Tp>
     {};
 
 // is_trivially_copy_constructible
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_trivially_copy_constructible
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_trivially_copy_constructible
     : public is_trivially_constructible<_Tp, const typename add_lvalue_reference<_Tp>::type>
     {};
 
 // is_trivially_move_constructible
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_trivially_move_constructible
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_trivially_move_constructible
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
     : public is_trivially_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>
 #else
@@ -2305,14 +2332,14 @@
 
 // is_trivially_copy_assignable
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_trivially_copy_assignable
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_trivially_copy_assignable
     : public is_trivially_assignable<typename add_lvalue_reference<_Tp>::type,
                                const typename add_lvalue_reference<_Tp>::type>
     {};
 
 // is_trivially_move_assignable
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_trivially_move_assignable
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_trivially_move_assignable
     : public is_trivially_assignable<typename add_lvalue_reference<_Tp>::type,
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
                                      typename add_rvalue_reference<_Tp>::type>
@@ -2325,7 +2352,7 @@
 
 #if __has_feature(has_trivial_destructor) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_trivially_destructible
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_trivially_destructible
     : public integral_constant<bool, __has_trivial_destructor(_Tp)> {};
 
 #else  // _LIBCPP_HAS_TYPE_TRAITS
@@ -2334,7 +2361,7 @@
     : public integral_constant<bool, is_scalar<_Tp>::value ||
                                      is_reference<_Tp>::value> {};
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_trivially_destructible
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_trivially_destructible
     : public __libcpp_trivial_destructor<typename remove_all_extents<_Tp>::type> {};
 
 #endif  // _LIBCPP_HAS_TYPE_TRAITS
@@ -2360,13 +2387,13 @@
 };
 
 template <class _Tp, class... _Args>
-struct _LIBCPP_VISIBLE is_nothrow_constructible
+struct _LIBCPP_TYPE_VIS is_nothrow_constructible
     : __is_nothrow_constructible<is_constructible<_Tp, _Args...>::value, _Tp, _Args...>
 {
 };
 
 template <class _Tp, size_t _Ns>
-struct _LIBCPP_VISIBLE is_nothrow_constructible<_Tp[_Ns]>
+struct _LIBCPP_TYPE_VIS is_nothrow_constructible<_Tp[_Ns]>
     : __is_nothrow_constructible<is_constructible<_Tp>::value, _Tp>
 {
 };
@@ -2374,13 +2401,13 @@
 #else  // __has_feature(cxx_noexcept)
 
 template <class _Tp, class... _Args>
-struct _LIBCPP_VISIBLE is_nothrow_constructible
+struct _LIBCPP_TYPE_VIS is_nothrow_constructible
     : false_type
 {
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_nothrow_constructible<_Tp>
+struct _LIBCPP_TYPE_VIS is_nothrow_constructible<_Tp>
 #if __has_feature(has_nothrow_constructor) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
     : integral_constant<bool, __has_nothrow_constructor(_Tp)>
 #else
@@ -2391,9 +2418,9 @@
 
 template <class _Tp>
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-struct _LIBCPP_VISIBLE is_nothrow_constructible<_Tp, _Tp&&>
+struct _LIBCPP_TYPE_VIS is_nothrow_constructible<_Tp, _Tp&&>
 #else
-struct _LIBCPP_VISIBLE is_nothrow_constructible<_Tp, _Tp>
+struct _LIBCPP_TYPE_VIS is_nothrow_constructible<_Tp, _Tp>
 #endif
 #if __has_feature(has_nothrow_copy) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
     : integral_constant<bool, __has_nothrow_copy(_Tp)>
@@ -2404,7 +2431,7 @@
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_nothrow_constructible<_Tp, const _Tp&>
+struct _LIBCPP_TYPE_VIS is_nothrow_constructible<_Tp, const _Tp&>
 #if __has_feature(has_nothrow_copy) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
     : integral_constant<bool, __has_nothrow_copy(_Tp)>
 #else
@@ -2414,7 +2441,7 @@
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_nothrow_constructible<_Tp, _Tp&>
+struct _LIBCPP_TYPE_VIS is_nothrow_constructible<_Tp, _Tp&>
 #if __has_feature(has_nothrow_copy) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
     : integral_constant<bool, __has_nothrow_copy(_Tp)>
 #else
@@ -2429,13 +2456,13 @@
 
 template <class _Tp, class _A0 = __is_construct::__nat,
                      class _A1 = __is_construct::__nat>
-struct _LIBCPP_VISIBLE is_nothrow_constructible
+struct _LIBCPP_TYPE_VIS is_nothrow_constructible
     : false_type
 {
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_nothrow_constructible<_Tp, __is_construct::__nat,
+struct _LIBCPP_TYPE_VIS is_nothrow_constructible<_Tp, __is_construct::__nat,
                                                        __is_construct::__nat>
 #if __has_feature(has_nothrow_constructor) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
     : integral_constant<bool, __has_nothrow_constructor(_Tp)>
@@ -2446,7 +2473,7 @@
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_nothrow_constructible<_Tp, _Tp,
+struct _LIBCPP_TYPE_VIS is_nothrow_constructible<_Tp, _Tp,
                                                        __is_construct::__nat>
 #if __has_feature(has_nothrow_copy) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
     : integral_constant<bool, __has_nothrow_copy(_Tp)>
@@ -2457,7 +2484,7 @@
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_nothrow_constructible<_Tp, const _Tp&,
+struct _LIBCPP_TYPE_VIS is_nothrow_constructible<_Tp, const _Tp&,
                                                        __is_construct::__nat>
 #if __has_feature(has_nothrow_copy) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
     : integral_constant<bool, __has_nothrow_copy(_Tp)>
@@ -2468,7 +2495,7 @@
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_nothrow_constructible<_Tp, _Tp&,
+struct _LIBCPP_TYPE_VIS is_nothrow_constructible<_Tp, _Tp&,
                                                        __is_construct::__nat>
 #if __has_feature(has_nothrow_copy) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
     : integral_constant<bool, __has_nothrow_copy(_Tp)>
@@ -2482,19 +2509,19 @@
 
 // is_nothrow_default_constructible
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_nothrow_default_constructible
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_nothrow_default_constructible
     : public is_nothrow_constructible<_Tp>
     {};
 
 // is_nothrow_copy_constructible
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_nothrow_copy_constructible
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_nothrow_copy_constructible
     : public is_nothrow_constructible<_Tp, const typename add_lvalue_reference<_Tp>::type>
     {};
 
 // is_nothrow_move_constructible
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_nothrow_move_constructible
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_nothrow_move_constructible
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
     : public is_nothrow_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>
 #else
@@ -2521,7 +2548,7 @@
 };
 
 template <class _Tp, class _Arg>
-struct _LIBCPP_VISIBLE is_nothrow_assignable
+struct _LIBCPP_TYPE_VIS is_nothrow_assignable
     : public __is_nothrow_assignable<is_assignable<_Tp, _Arg>::value, _Tp, _Arg>
 {
 };
@@ -2529,11 +2556,11 @@
 #else  // __has_feature(cxx_noexcept)
 
 template <class _Tp, class _Arg>
-struct _LIBCPP_VISIBLE is_nothrow_assignable
+struct _LIBCPP_TYPE_VIS is_nothrow_assignable
     : public false_type {};
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_nothrow_assignable<_Tp&, _Tp>
+struct _LIBCPP_TYPE_VIS is_nothrow_assignable<_Tp&, _Tp>
 #if __has_feature(has_nothrow_assign) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
     : integral_constant<bool, __has_nothrow_assign(_Tp)> {};
 #else
@@ -2541,7 +2568,7 @@
 #endif
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_nothrow_assignable<_Tp&, _Tp&>
+struct _LIBCPP_TYPE_VIS is_nothrow_assignable<_Tp&, _Tp&>
 #if __has_feature(has_nothrow_assign) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
     : integral_constant<bool, __has_nothrow_assign(_Tp)> {};
 #else
@@ -2549,7 +2576,7 @@
 #endif
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_nothrow_assignable<_Tp&, const _Tp&>
+struct _LIBCPP_TYPE_VIS is_nothrow_assignable<_Tp&, const _Tp&>
 #if __has_feature(has_nothrow_assign) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
     : integral_constant<bool, __has_nothrow_assign(_Tp)> {};
 #else
@@ -2572,14 +2599,14 @@
 
 // is_nothrow_copy_assignable
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_nothrow_copy_assignable
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_nothrow_copy_assignable
     : public is_nothrow_assignable<typename add_lvalue_reference<_Tp>::type,
                                const typename add_lvalue_reference<_Tp>::type>
     {};
 
 // is_nothrow_move_assignable
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_nothrow_move_assignable
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_nothrow_move_assignable
     : public is_nothrow_assignable<typename add_lvalue_reference<_Tp>::type,
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
                                      typename add_rvalue_reference<_Tp>::type>
@@ -2607,19 +2634,19 @@
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_nothrow_destructible
+struct _LIBCPP_TYPE_VIS is_nothrow_destructible
     : public __is_nothrow_destructible<is_destructible<_Tp>::value, _Tp>
 {
 };
 
 template <class _Tp, size_t _Ns>
-struct _LIBCPP_VISIBLE is_nothrow_destructible<_Tp[_Ns]>
+struct _LIBCPP_TYPE_VIS is_nothrow_destructible<_Tp[_Ns]>
     : public is_nothrow_destructible<_Tp>
 {
 };
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_nothrow_destructible<_Tp&>
+struct _LIBCPP_TYPE_VIS is_nothrow_destructible<_Tp&>
     : public true_type
 {
 };
@@ -2627,7 +2654,7 @@
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
 template <class _Tp>
-struct _LIBCPP_VISIBLE is_nothrow_destructible<_Tp&&>
+struct _LIBCPP_TYPE_VIS is_nothrow_destructible<_Tp&&>
     : public true_type
 {
 };
@@ -2640,7 +2667,7 @@
     : public integral_constant<bool, is_scalar<_Tp>::value ||
                                      is_reference<_Tp>::value> {};
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_nothrow_destructible
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_nothrow_destructible
     : public __libcpp_nothrow_destructor<typename remove_all_extents<_Tp>::type> {};
 
 #endif
@@ -2649,12 +2676,12 @@
 
 #if __has_feature(is_pod) || (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_pod
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_pod
     : public integral_constant<bool, __is_pod(_Tp)> {};
 
 #else  // _LIBCPP_HAS_TYPE_TRAITS
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_pod
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_pod
     : public integral_constant<bool, is_trivially_default_constructible<_Tp>::value   &&
                                      is_trivially_copy_constructible<_Tp>::value      &&
                                      is_trivially_copy_assignable<_Tp>::value    &&
@@ -2664,7 +2691,7 @@
 
 // is_literal_type;
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_literal_type
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_literal_type
 #if __has_feature(is_literal)
     : public integral_constant<bool, __is_literal(_Tp)>
 #else
@@ -2675,7 +2702,7 @@
     
 // is_standard_layout;
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_standard_layout
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_standard_layout
 #if __has_feature(is_standard_layout)
     : public integral_constant<bool, __is_standard_layout(_Tp)>
 #else
@@ -2685,7 +2712,7 @@
     
 // is_trivially_copyable;
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_trivially_copyable
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_trivially_copyable
 #if __has_feature(is_trivially_copyable)
     : public integral_constant<bool, __is_trivially_copyable(_Tp)>
 #else
@@ -2695,7 +2722,7 @@
     
 // is_trivial;
 
-template <class _Tp> struct _LIBCPP_VISIBLE is_trivial
+template <class _Tp> struct _LIBCPP_TYPE_VIS is_trivial
 #if __has_feature(is_trivial)
     : public integral_constant<bool, __is_trivial(_Tp)>
 #else
@@ -2924,7 +2951,7 @@
 };
 
 template <class _Fp, class ..._Args>
-class _LIBCPP_VISIBLE result_of<_Fp(_Args...)>
+class _LIBCPP_TYPE_VIS result_of<_Fp(_Args...)>
     : public __invoke_of<_Fp, _Args...>
 {
 };
diff --git a/sources/cxx-stl/llvm-libc++/include/typeindex b/sources/cxx-stl/llvm-libc++/libcxx/include/typeindex
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/include/typeindex
rename to sources/cxx-stl/llvm-libc++/libcxx/include/typeindex
index 398b528..67462b7 100644
--- a/sources/cxx-stl/llvm-libc++/include/typeindex
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/typeindex
@@ -55,7 +55,7 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-class _LIBCPP_VISIBLE type_index
+class _LIBCPP_TYPE_VIS type_index
 {
     const type_info* __t_;
 public:
@@ -87,10 +87,10 @@
     const char* name() const _NOEXCEPT {return __t_->name();}
 };
 
-template <class _Tp> struct _LIBCPP_VISIBLE hash;
+template <class _Tp> struct _LIBCPP_TYPE_VIS hash;
 
 template <>
-struct _LIBCPP_VISIBLE hash<type_index>
+struct _LIBCPP_TYPE_VIS hash<type_index>
     : public unary_function<type_index, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
diff --git a/sources/cxx-stl/llvm-libc++/include/typeinfo b/sources/cxx-stl/llvm-libc++/libcxx/include/typeinfo
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/include/typeinfo
rename to sources/cxx-stl/llvm-libc++/libcxx/include/typeinfo
diff --git a/sources/cxx-stl/llvm-libc++/include/unordered_map b/sources/cxx-stl/llvm-libc++/libcxx/include/unordered_map
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/unordered_map
rename to sources/cxx-stl/llvm-libc++/libcxx/include/unordered_map
index cb2ab42..235b2ea 100644
--- a/sources/cxx-stl/llvm-libc++/include/unordered_map
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/unordered_map
@@ -544,7 +544,7 @@
 };
 
 template <class _HashIterator>
-class _LIBCPP_VISIBLE __hash_map_iterator
+class _LIBCPP_TYPE_VIS __hash_map_iterator
 {
     _HashIterator __i_;
 
@@ -592,15 +592,15 @@
         bool operator!=(const __hash_map_iterator& __x, const __hash_map_iterator& __y)
         {return __x.__i_ != __y.__i_;}
 
-    template <class, class, class, class, class> friend class _LIBCPP_VISIBLE unordered_map;
-    template <class, class, class, class, class> friend class _LIBCPP_VISIBLE unordered_multimap;
-    template <class> friend class _LIBCPP_VISIBLE __hash_const_iterator;
-    template <class> friend class _LIBCPP_VISIBLE __hash_const_local_iterator;
-    template <class> friend class _LIBCPP_VISIBLE __hash_map_const_iterator;
+    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS unordered_map;
+    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS unordered_multimap;
+    template <class> friend class _LIBCPP_TYPE_VIS __hash_const_iterator;
+    template <class> friend class _LIBCPP_TYPE_VIS __hash_const_local_iterator;
+    template <class> friend class _LIBCPP_TYPE_VIS __hash_map_const_iterator;
 };
 
 template <class _HashIterator>
-class _LIBCPP_VISIBLE __hash_map_const_iterator
+class _LIBCPP_TYPE_VIS __hash_map_const_iterator
 {
     _HashIterator __i_;
 
@@ -653,15 +653,15 @@
         bool operator!=(const __hash_map_const_iterator& __x, const __hash_map_const_iterator& __y)
         {return __x.__i_ != __y.__i_;}
 
-    template <class, class, class, class, class> friend class _LIBCPP_VISIBLE unordered_map;
-    template <class, class, class, class, class> friend class _LIBCPP_VISIBLE unordered_multimap;
-    template <class> friend class _LIBCPP_VISIBLE __hash_const_iterator;
-    template <class> friend class _LIBCPP_VISIBLE __hash_const_local_iterator;
+    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS unordered_map;
+    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS unordered_multimap;
+    template <class> friend class _LIBCPP_TYPE_VIS __hash_const_iterator;
+    template <class> friend class _LIBCPP_TYPE_VIS __hash_const_local_iterator;
 };
 
 template <class _Key, class _Tp, class _Hash = hash<_Key>, class _Pred = equal_to<_Key>,
           class _Alloc = allocator<pair<const _Key, _Tp> > >
-class _LIBCPP_VISIBLE unordered_map
+class _LIBCPP_TYPE_VIS unordered_map
 {
 public:
     // types
@@ -1294,7 +1294,7 @@
 
 template <class _Key, class _Tp, class _Hash = hash<_Key>, class _Pred = equal_to<_Key>,
           class _Alloc = allocator<pair<const _Key, _Tp> > >
-class _LIBCPP_VISIBLE unordered_multimap
+class _LIBCPP_TYPE_VIS unordered_multimap
 {
 public:
     // types
diff --git a/sources/cxx-stl/llvm-libc++/include/unordered_set b/sources/cxx-stl/llvm-libc++/libcxx/include/unordered_set
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/include/unordered_set
rename to sources/cxx-stl/llvm-libc++/libcxx/include/unordered_set
index 279e907..119251d 100644
--- a/sources/cxx-stl/llvm-libc++/include/unordered_set
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/unordered_set
@@ -313,7 +313,7 @@
 
 template <class _Value, class _Hash = hash<_Value>, class _Pred = equal_to<_Value>,
           class _Alloc = allocator<_Value> >
-class _LIBCPP_VISIBLE unordered_set
+class _LIBCPP_TYPE_VIS unordered_set
 {
 public:
     // types
@@ -725,7 +725,7 @@
 
 template <class _Value, class _Hash = hash<_Value>, class _Pred = equal_to<_Value>,
           class _Alloc = allocator<_Value> >
-class _LIBCPP_VISIBLE unordered_multiset
+class _LIBCPP_TYPE_VIS unordered_multiset
 {
 public:
     // types
diff --git a/sources/cxx-stl/llvm-libc++/include/utility b/sources/cxx-stl/llvm-libc++/libcxx/include/utility
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/include/utility
rename to sources/cxx-stl/llvm-libc++/libcxx/include/utility
index 514ce17..2df4b36 100644
--- a/sources/cxx-stl/llvm-libc++/include/utility
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/utility
@@ -205,7 +205,7 @@
     return _VSTD::move(__x);
 }
 
-struct _LIBCPP_VISIBLE piecewise_construct_t { };
+struct _LIBCPP_TYPE_VIS piecewise_construct_t { };
 #if defined(_LIBCPP_HAS_NO_CONSTEXPR) || defined(_LIBCPP_BUILDING_UTILITY)
 extern const piecewise_construct_t piecewise_construct;// = piecewise_construct_t();
 #else
@@ -213,7 +213,7 @@
 #endif
 
 template <class _T1, class _T2>
-struct _LIBCPP_VISIBLE pair
+struct _LIBCPP_TYPE_VIS pair
 {
     typedef _T1 first_type;
     typedef _T2 second_type;
@@ -419,7 +419,7 @@
 
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
-template <class _Tp> class _LIBCPP_VISIBLE reference_wrapper;
+template <class _Tp> class _LIBCPP_TYPE_VIS reference_wrapper;
 
 template <class _Tp>
 struct ___make_pair_return
@@ -461,36 +461,36 @@
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
 template <class _T1, class _T2>
-  class _LIBCPP_VISIBLE tuple_size<pair<_T1, _T2> >
+  class _LIBCPP_TYPE_VIS tuple_size<pair<_T1, _T2> >
     : public integral_constant<size_t, 2> {};
 
 template <class _T1, class _T2>
-  class _LIBCPP_VISIBLE tuple_size<const pair<_T1, _T2> >
+  class _LIBCPP_TYPE_VIS tuple_size<const pair<_T1, _T2> >
     : public integral_constant<size_t, 2> {};
 
 template <class _T1, class _T2>
-class _LIBCPP_VISIBLE tuple_element<0, pair<_T1, _T2> >
+class _LIBCPP_TYPE_VIS tuple_element<0, pair<_T1, _T2> >
 {
 public:
     typedef _T1 type;
 };
 
 template <class _T1, class _T2>
-class _LIBCPP_VISIBLE tuple_element<1, pair<_T1, _T2> >
+class _LIBCPP_TYPE_VIS tuple_element<1, pair<_T1, _T2> >
 {
 public:
     typedef _T2 type;
 };
 
 template <class _T1, class _T2>
-class _LIBCPP_VISIBLE tuple_element<0, const pair<_T1, _T2> >
+class _LIBCPP_TYPE_VIS tuple_element<0, const pair<_T1, _T2> >
 {
 public:
     typedef const _T1 type;
 };
 
 template <class _T1, class _T2>
-class _LIBCPP_VISIBLE tuple_element<1, const pair<_T1, _T2> >
+class _LIBCPP_TYPE_VIS tuple_element<1, const pair<_T1, _T2> >
 {
 public:
     typedef const _T2 type;
diff --git a/sources/cxx-stl/llvm-libc++/include/valarray b/sources/cxx-stl/llvm-libc++/libcxx/include/valarray
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/include/valarray
rename to sources/cxx-stl/llvm-libc++/libcxx/include/valarray
index c56dd12..71c8a74 100644
--- a/sources/cxx-stl/llvm-libc++/include/valarray
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/valarray
@@ -354,9 +354,9 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-template<class _Tp> class _LIBCPP_VISIBLE valarray;
+template<class _Tp> class _LIBCPP_TYPE_VIS valarray;
 
-class _LIBCPP_VISIBLE slice
+class _LIBCPP_TYPE_VIS slice
 {
     size_t __start_;
     size_t __size_;
@@ -381,11 +381,11 @@
     _LIBCPP_INLINE_VISIBILITY size_t stride() const {return __stride_;}
 };
 
-template <class _Tp> class _LIBCPP_VISIBLE slice_array;
-class _LIBCPP_VISIBLE gslice;
-template <class _Tp> class _LIBCPP_VISIBLE gslice_array;
-template <class _Tp> class _LIBCPP_VISIBLE mask_array;
-template <class _Tp> class _LIBCPP_VISIBLE indirect_array;
+template <class _Tp> class _LIBCPP_TYPE_VIS slice_array;
+class _LIBCPP_TYPE_VIS gslice;
+template <class _Tp> class _LIBCPP_TYPE_VIS gslice_array;
+template <class _Tp> class _LIBCPP_TYPE_VIS mask_array;
+template <class _Tp> class _LIBCPP_TYPE_VIS indirect_array;
 
 template <class _Tp>
 _LIBCPP_INLINE_VISIBILITY
@@ -671,7 +671,7 @@
     _LIBCPP_INLINE_VISIBILITY
     size_t size() const {return __size_;}
 
-    template <class> friend class _LIBCPP_VISIBLE valarray;
+    template <class> friend class _LIBCPP_TYPE_VIS valarray;
 };
 
 template <class _ValExpr>
@@ -786,7 +786,7 @@
 struct __is_val_expr<valarray<_Tp> > : true_type {};
 
 template<class _Tp>
-class _LIBCPP_VISIBLE valarray
+class _LIBCPP_TYPE_VIS valarray
 {
 public:
     typedef _Tp value_type;
@@ -976,12 +976,12 @@
     void     resize(size_t __n, value_type __x = value_type());
 
 private:
-    template <class> friend class _LIBCPP_VISIBLE valarray;
-    template <class> friend class _LIBCPP_VISIBLE slice_array;
-    template <class> friend class _LIBCPP_VISIBLE gslice_array;
-    template <class> friend class _LIBCPP_VISIBLE mask_array;
+    template <class> friend class _LIBCPP_TYPE_VIS valarray;
+    template <class> friend class _LIBCPP_TYPE_VIS slice_array;
+    template <class> friend class _LIBCPP_TYPE_VIS gslice_array;
+    template <class> friend class _LIBCPP_TYPE_VIS mask_array;
     template <class> friend class __mask_expr;
-    template <class> friend class _LIBCPP_VISIBLE indirect_array;
+    template <class> friend class _LIBCPP_TYPE_VIS indirect_array;
     template <class> friend class __indirect_expr;
     template <class> friend class __val_expr;
 
@@ -1091,7 +1091,7 @@
 // slice_array
 
 template <class _Tp>
-class _LIBCPP_VISIBLE slice_array
+class _LIBCPP_TYPE_VIS slice_array
 {
 public:
     typedef _Tp value_type;
@@ -1394,7 +1394,7 @@
 
 // gslice
 
-class _LIBCPP_VISIBLE gslice
+class _LIBCPP_TYPE_VIS gslice
 {
     valarray<size_t> __size_;
     valarray<size_t> __stride_;
@@ -1461,7 +1461,7 @@
 // gslice_array
 
 template <class _Tp>
-class _LIBCPP_VISIBLE gslice_array
+class _LIBCPP_TYPE_VIS gslice_array
 {
 public:
     typedef _Tp value_type;
@@ -1790,7 +1790,7 @@
 // mask_array
 
 template <class _Tp>
-class _LIBCPP_VISIBLE mask_array
+class _LIBCPP_TYPE_VIS mask_array
 {
 public:
     typedef _Tp value_type;
@@ -2134,7 +2134,7 @@
 // indirect_array
 
 template <class _Tp>
-class _LIBCPP_VISIBLE indirect_array
+class _LIBCPP_TYPE_VIS indirect_array
 {
 public:
     typedef _Tp value_type;
@@ -2485,7 +2485,7 @@
     _LIBCPP_INLINE_VISIBILITY
     size_t size() const {return __1d_.size();}
 
-    template <class> friend class _LIBCPP_VISIBLE valarray;
+    template <class> friend class _LIBCPP_TYPE_VIS valarray;
 };
 
 template<class _ValExpr>
diff --git a/sources/cxx-stl/llvm-libc++/include/vector b/sources/cxx-stl/llvm-libc++/libcxx/include/vector
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/include/vector
rename to sources/cxx-stl/llvm-libc++/libcxx/include/vector
index 876b7e5..e04c267 100644
--- a/sources/cxx-stl/llvm-libc++/include/vector
+++ b/sources/cxx-stl/llvm-libc++/libcxx/include/vector
@@ -481,7 +481,7 @@
 }
 
 template <class _Tp, class _Allocator = allocator<_Tp> >
-class _LIBCPP_VISIBLE vector
+class _LIBCPP_TYPE_VIS vector
     : private __vector_base<_Tp, _Allocator>
 {
 private:
@@ -502,6 +502,9 @@
     typedef _VSTD::reverse_iterator<iterator>         reverse_iterator;
     typedef _VSTD::reverse_iterator<const_iterator>   const_reverse_iterator;
 
+    static_assert((is_same<typename allocator_type::value_type, value_type>::value),
+                  "Allocator::value_type must be same type as value_type");
+
     _LIBCPP_INLINE_VISIBILITY
     vector()
         _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
@@ -523,17 +526,29 @@
     template <class _InputIterator>
         vector(_InputIterator __first, _InputIterator __last,
                typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                                 !__is_forward_iterator<_InputIterator>::value>::type* = 0);
+                                 !__is_forward_iterator<_InputIterator>::value &&
+                                 is_constructible<
+                                    value_type,
+                                    typename iterator_traits<_InputIterator>::reference>::value>::type* = 0);
     template <class _InputIterator>
         vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a,
                typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                                 !__is_forward_iterator<_InputIterator>::value>::type* = 0);
+                                 !__is_forward_iterator<_InputIterator>::value &&
+                                 is_constructible<
+                                    value_type,
+                                    typename iterator_traits<_InputIterator>::reference>::value>::type* = 0);
     template <class _ForwardIterator>
         vector(_ForwardIterator __first, _ForwardIterator __last,
-               typename enable_if<__is_forward_iterator<_ForwardIterator>::value>::type* = 0);
+               typename enable_if<__is_forward_iterator<_ForwardIterator>::value &&
+                                 is_constructible<
+                                    value_type,
+                                    typename iterator_traits<_ForwardIterator>::reference>::value>::type* = 0);
     template <class _ForwardIterator>
         vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a,
-               typename enable_if<__is_forward_iterator<_ForwardIterator>::value>::type* = 0);
+               typename enable_if<__is_forward_iterator<_ForwardIterator>::value &&
+                                 is_constructible<
+                                    value_type,
+                                    typename iterator_traits<_ForwardIterator>::reference>::value>::type* = 0);
 #ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
     _LIBCPP_INLINE_VISIBILITY
     vector(initializer_list<value_type> __il);
@@ -574,14 +589,20 @@
         typename enable_if
         <
              __is_input_iterator  <_InputIterator>::value &&
-            !__is_forward_iterator<_InputIterator>::value,
+            !__is_forward_iterator<_InputIterator>::value &&
+            is_constructible<
+                 value_type,
+                 typename iterator_traits<_InputIterator>::reference>::value,
             void
         >::type
         assign(_InputIterator __first, _InputIterator __last);
     template <class _ForwardIterator>
         typename enable_if
         <
-            __is_forward_iterator<_ForwardIterator>::value,
+            __is_forward_iterator<_ForwardIterator>::value &&
+            is_constructible<
+                 value_type,
+                 typename iterator_traits<_ForwardIterator>::reference>::value,
             void
         >::type
         assign(_ForwardIterator __first, _ForwardIterator __last);
@@ -697,14 +718,20 @@
         typename enable_if
         <
              __is_input_iterator  <_InputIterator>::value &&
-            !__is_forward_iterator<_InputIterator>::value,
+            !__is_forward_iterator<_InputIterator>::value &&
+            is_constructible<
+                 value_type,
+                 typename iterator_traits<_InputIterator>::reference>::value,
             iterator
         >::type
         insert(const_iterator __position, _InputIterator __first, _InputIterator __last);
     template <class _ForwardIterator>
         typename enable_if
         <
-            __is_forward_iterator<_ForwardIterator>::value,
+            __is_forward_iterator<_ForwardIterator>::value &&
+            is_constructible<
+                 value_type,
+                 typename iterator_traits<_ForwardIterator>::reference>::value,
             iterator
         >::type
         insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last);
@@ -1031,7 +1058,10 @@
 template <class _InputIterator>
 vector<_Tp, _Allocator>::vector(_InputIterator __first, _InputIterator __last,
        typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                         !__is_forward_iterator<_InputIterator>::value>::type*)
+                         !__is_forward_iterator<_InputIterator>::value &&
+                         is_constructible<
+                            value_type,
+                            typename iterator_traits<_InputIterator>::reference>::value>::type*)
 {
 #if _LIBCPP_DEBUG_LEVEL >= 2
     __get_db()->__insert_c(this);
@@ -1044,7 +1074,10 @@
 template <class _InputIterator>
 vector<_Tp, _Allocator>::vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a,
        typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                         !__is_forward_iterator<_InputIterator>::value>::type*)
+                         !__is_forward_iterator<_InputIterator>::value &&
+                         is_constructible<
+                            value_type,
+                            typename iterator_traits<_InputIterator>::reference>::value>::type*)
     : __base(__a)
 {
 #if _LIBCPP_DEBUG_LEVEL >= 2
@@ -1057,7 +1090,10 @@
 template <class _Tp, class _Allocator>
 template <class _ForwardIterator>
 vector<_Tp, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __last,
-                                typename enable_if<__is_forward_iterator<_ForwardIterator>::value>::type*)
+                                typename enable_if<__is_forward_iterator<_ForwardIterator>::value &&
+                                is_constructible<
+                                   value_type,
+                                   typename iterator_traits<_ForwardIterator>::reference>::value>::type*)
 {
 #if _LIBCPP_DEBUG_LEVEL >= 2
     __get_db()->__insert_c(this);
@@ -1073,7 +1109,10 @@
 template <class _Tp, class _Allocator>
 template <class _ForwardIterator>
 vector<_Tp, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a,
-                                typename enable_if<__is_forward_iterator<_ForwardIterator>::value>::type*)
+                                typename enable_if<__is_forward_iterator<_ForwardIterator>::value &&
+                                is_constructible<
+                                   value_type,
+                                   typename iterator_traits<_ForwardIterator>::reference>::value>::type*)
     : __base(__a)
 {
 #if _LIBCPP_DEBUG_LEVEL >= 2
@@ -1255,7 +1294,10 @@
 typename enable_if
 <
      __is_input_iterator  <_InputIterator>::value &&
-    !__is_forward_iterator<_InputIterator>::value,
+    !__is_forward_iterator<_InputIterator>::value &&
+    is_constructible<
+       _Tp,
+       typename iterator_traits<_InputIterator>::reference>::value,
     void
 >::type
 vector<_Tp, _Allocator>::assign(_InputIterator __first, _InputIterator __last)
@@ -1269,7 +1311,10 @@
 template <class _ForwardIterator>
 typename enable_if
 <
-    __is_forward_iterator<_ForwardIterator>::value,
+    __is_forward_iterator<_ForwardIterator>::value &&
+    is_constructible<
+       _Tp,
+       typename iterator_traits<_ForwardIterator>::reference>::value,
     void
 >::type
 vector<_Tp, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __last)
@@ -1550,6 +1595,8 @@
         "vector::erase(iterator) called with an iterator not"
         " referring to this vector");
 #endif
+    _LIBCPP_ASSERT(__position != end(),
+        "vector::erase(iterator) called with a non-dereferenceable iterator");
     pointer __p = const_cast<pointer>(&*__position);
     iterator __r = __make_iter(__p);
     this->__destruct_at_end(_VSTD::move(__p + 1, this->__end_, __p));
@@ -1568,7 +1615,8 @@
     _LIBCPP_ASSERT(__first <= __last, "vector::erase(first, last) called with invalid range");
     pointer __p = this->__begin_ + (__first - begin());
     iterator __r = __make_iter(__p);
-    this->__destruct_at_end(_VSTD::move(__p + (__last - __first), this->__end_, __p));
+    if (__first != __last)
+        this->__destruct_at_end(_VSTD::move(__p + (__last - __first), this->__end_, __p));
     return __r;
 }
 
@@ -1748,7 +1796,10 @@
 typename enable_if
 <
      __is_input_iterator  <_InputIterator>::value &&
-    !__is_forward_iterator<_InputIterator>::value,
+    !__is_forward_iterator<_InputIterator>::value &&
+    is_constructible<
+       _Tp,
+       typename iterator_traits<_InputIterator>::reference>::value,
     typename vector<_Tp, _Allocator>::iterator
 >::type
 vector<_Tp, _Allocator>::insert(const_iterator __position, _InputIterator __first, _InputIterator __last)
@@ -1800,7 +1851,10 @@
 template <class _ForwardIterator>
 typename enable_if
 <
-    __is_forward_iterator<_ForwardIterator>::value,
+    __is_forward_iterator<_ForwardIterator>::value &&
+    is_constructible<
+       _Tp,
+       typename iterator_traits<_ForwardIterator>::reference>::value,
     typename vector<_Tp, _Allocator>::iterator
 >::type
 vector<_Tp, _Allocator>::insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last)
@@ -1963,7 +2017,7 @@
 };
 
 template <class _Allocator>
-class _LIBCPP_VISIBLE vector<bool, _Allocator>
+class _LIBCPP_TYPE_VIS vector<bool, _Allocator>
     : private __vector_base_common<true>
 {
 public:
@@ -2321,7 +2375,7 @@
     friend class __bit_iterator<vector, false>;
     friend class __bit_iterator<vector, true>;
     friend struct __bit_array<vector>;
-    friend struct _LIBCPP_VISIBLE hash<vector>;
+    friend struct _LIBCPP_TYPE_VIS hash<vector>;
 };
 
 template <class _Allocator>
@@ -3104,7 +3158,7 @@
 }
 
 template <class _Allocator>
-struct _LIBCPP_VISIBLE hash<vector<bool, _Allocator> >
+struct _LIBCPP_TYPE_VIS hash<vector<bool, _Allocator> >
     : public unary_function<vector<bool, _Allocator>, size_t>
 {
     _LIBCPP_INLINE_VISIBILITY
diff --git a/sources/cxx-stl/llvm-libc++/src/algorithm.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/algorithm.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/algorithm.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/algorithm.cpp
diff --git a/sources/cxx-stl/llvm-libc++/src/bind.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/bind.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/bind.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/bind.cpp
diff --git a/sources/cxx-stl/llvm-libc++/src/chrono.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/chrono.cpp
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/src/chrono.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/chrono.cpp
index 1ce2e28..15a6f46 100644
--- a/sources/cxx-stl/llvm-libc++/src/chrono.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/src/chrono.cpp
@@ -9,7 +9,7 @@
 
 #include "chrono"
 #include <sys/time.h>        //for gettimeofday and timeval
-#if __APPLE__
+#ifdef __APPLE__
 #include <mach/mach_time.h>  // mach_absolute_time, mach_timebase_info_data_t
 #else  /* !__APPLE__ */
 #include <cerrno>  // errno
@@ -50,7 +50,7 @@
 
 const bool steady_clock::is_steady;
 
-#if __APPLE__
+#ifdef __APPLE__
 //   mach_absolute_time() * MachInfo.numer / MachInfo.denom is the number of
 //   nanoseconds since the computer booted up.  MachInfo.numer and MachInfo.denom
 //   are run time constants supplied by the OS.  This clock has no relationship
diff --git a/sources/cxx-stl/llvm-libc++/src/condition_variable.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/condition_variable.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/condition_variable.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/condition_variable.cpp
diff --git a/sources/cxx-stl/llvm-libc++/src/debug.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/debug.cpp
similarity index 94%
rename from sources/cxx-stl/llvm-libc++/src/debug.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/debug.cpp
index f3a0262..04d570e 100644
--- a/sources/cxx-stl/llvm-libc++/src/debug.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/src/debug.cpp
@@ -17,7 +17,7 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-_LIBCPP_VISIBLE
+_LIBCPP_FUNC_VIS
 __libcpp_db*
 __get_db()
 {
@@ -25,7 +25,7 @@
     return &db;
 }
 
-_LIBCPP_VISIBLE
+_LIBCPP_FUNC_VIS
 const __libcpp_db*
 __get_const_db()
 {
@@ -110,8 +110,7 @@
 {
     RLock _(mut());
     __i_node* i = __find_iterator(__i);
-    _LIBCPP_ASSERT(i != nullptr, "iterator constructed in translation unit with debug mode not enabled."
-                   "  #define _LIBCPP_DEBUG2 1 for that translation unit.");
+    _LIBCPP_ASSERT(i != nullptr, "iterator not found in debug database.");
     return i->__c_ != nullptr ? i->__c_->__c_ : nullptr;
 }
 
@@ -144,7 +143,7 @@
     if (__csz_ + 1 > static_cast<size_t>(__cend_ - __cbeg_))
     {
         size_t nc = __next_prime(2*static_cast<size_t>(__cend_ - __cbeg_) + 1);
-        __c_node** cbeg = (__c_node**)calloc(nc, sizeof(void*));
+        __c_node** cbeg = static_cast<__c_node**>(calloc(nc, sizeof(void*)));
         if (cbeg == nullptr)
 #ifndef _LIBCPP_NO_EXCEPTIONS
             throw bad_alloc();
@@ -169,7 +168,8 @@
     }
     size_t hc = hash<void*>()(__c) % static_cast<size_t>(__cend_ - __cbeg_);
     __c_node* p = __cbeg_[hc];
-    __c_node* r = __cbeg_[hc] = (__c_node*)malloc(sizeof(__c_node));
+    __c_node* r = __cbeg_[hc] =
+      static_cast<__c_node*>(malloc(sizeof(__c_node)));
     if (__cbeg_[hc] == nullptr)
 #ifndef _LIBCPP_NO_EXCEPTIONS
         throw bad_alloc();
@@ -302,7 +302,7 @@
     __i_node* i = __find_iterator(__i);
     __i_node* i0 = __find_iterator(__i0);
     __c_node* c0 = i0 != nullptr ? i0->__c_ : nullptr;
-    if (i == nullptr && c0 != nullptr)
+    if (i == nullptr && i0 != nullptr)
         i = __insert_iterator(__i);
     __c_node* c = i != nullptr ? i->__c_ : nullptr;
     if (c != c0)
@@ -408,7 +408,8 @@
         size_t nc = 2*static_cast<size_t>(cap_ - beg_);
         if (nc == 0)
             nc = 1;
-        __i_node** beg = (__i_node**)malloc(nc * sizeof(__i_node*));
+        __i_node** beg =
+           static_cast<__i_node**>(malloc(nc * sizeof(__i_node*)));
         if (beg == nullptr)
 #ifndef _LIBCPP_NO_EXCEPTIONS
             throw bad_alloc();
@@ -434,7 +435,7 @@
     if (__isz_ + 1 > static_cast<size_t>(__iend_ - __ibeg_))
     {
         size_t nc = __next_prime(2*static_cast<size_t>(__iend_ - __ibeg_) + 1);
-        __i_node** ibeg = (__i_node**)calloc(nc, sizeof(void*));
+        __i_node** ibeg = static_cast<__i_node**>(calloc(nc, sizeof(void*)));
         if (ibeg == nullptr)
 #ifndef _LIBCPP_NO_EXCEPTIONS
             throw bad_alloc();
@@ -459,7 +460,8 @@
     }
     size_t hi = hash<void*>()(__i) % static_cast<size_t>(__iend_ - __ibeg_);
     __i_node* p = __ibeg_[hi];
-    __i_node* r = __ibeg_[hi] = (__i_node*)malloc(sizeof(__i_node));
+    __i_node* r = __ibeg_[hi] =
+      static_cast<__i_node*>(malloc(sizeof(__i_node)));
     if (r == nullptr)
 #ifndef _LIBCPP_NO_EXCEPTIONS
         throw bad_alloc();
diff --git a/sources/cxx-stl/llvm-libc++/src/exception.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/exception.cpp
similarity index 94%
rename from sources/cxx-stl/llvm-libc++/src/exception.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/exception.cpp
index f5e6d22..1d2f6b2 100644
--- a/sources/cxx-stl/llvm-libc++/src/exception.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/src/exception.cpp
@@ -14,7 +14,7 @@
 #define __has_include(inc) 0
 #endif
 
-#if __APPLE__
+#ifdef __APPLE__
   #include <cxxabi.h>
 
   using namespace __cxxabiv1;
@@ -33,7 +33,7 @@
   #if defined(LIBCXXRT) || defined(_LIBCPPABI_VERSION)
     #define HAVE_DEPENDENT_EH_ABI 1
   #endif
-#else  // __has_include(<cxxabi.h>)
+#elif !defined(__GLIBCXX__) // __has_include(<cxxabi.h>)
   static std::terminate_handler  __terminate_handler;
   static std::unexpected_handler __unexpected_handler;
 #endif // __has_include(<cxxabi.h>)
@@ -77,6 +77,7 @@
     return __sync_fetch_and_add(&__terminate_handler, (terminate_handler)0);
 }
 
+#ifndef EMSCRIPTEN // We provide this in JS
 _LIBCPP_NORETURN
 void
 terminate() _NOEXCEPT
@@ -97,12 +98,13 @@
     }
 #endif  // _LIBCPP_NO_EXCEPTIONS
 }
+#endif // !EMSCRIPTEN
 #endif // !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION)
 
-#if !defined(LIBCXXRT) && !defined(__GLIBCXX__)
+#if !defined(LIBCXXRT) && !defined(__GLIBCXX__) && !defined(EMSCRIPTEN)
 bool uncaught_exception() _NOEXCEPT
 {
-#if __APPLE__ || defined(_LIBCPPABI_VERSION)
+#if defined(__APPLE__) || defined(_LIBCPPABI_VERSION)
     // on Darwin, there is a helper function so __cxa_get_globals is private
     return __cxa_uncaught_exception();
 #else  // __APPLE__
diff --git a/sources/cxx-stl/llvm-libc++/src/future.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/future.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/future.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/future.cpp
diff --git a/sources/cxx-stl/llvm-libc++/src/hash.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/hash.cpp
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/src/hash.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/hash.cpp
index a013500..388ab2e 100644
--- a/sources/cxx-stl/llvm-libc++/src/hash.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/src/hash.cpp
@@ -12,7 +12,9 @@
 #include "stdexcept"
 #include "type_traits"
 
+#ifdef __clang__
 #pragma clang diagnostic ignored "-Wtautological-constant-out-of-range-compare"
+#endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
@@ -155,6 +157,8 @@
 #ifndef _LIBCPP_NO_EXCEPTIONS
     if (N > 0xFFFFFFFB)
         throw overflow_error("__next_prime overflow");
+#else
+    (void)N;
 #endif
 }
 
@@ -166,6 +170,8 @@
 #ifndef _LIBCPP_NO_EXCEPTIONS
     if (N > 0xFFFFFFFFFFFFFFC5ull)
         throw overflow_error("__next_prime overflow");
+#else
+    (void)N;
 #endif
 }
 
diff --git a/sources/cxx-stl/llvm-libc++/src/ios.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/ios.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/ios.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/ios.cpp
diff --git a/sources/cxx-stl/llvm-libc++/src/iostream.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/iostream.cpp
similarity index 81%
rename from sources/cxx-stl/llvm-libc++/src/iostream.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/iostream.cpp
index f5b959b..f413681 100644
--- a/sources/cxx-stl/llvm-libc++/src/iostream.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/src/iostream.cpp
@@ -13,6 +13,8 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
+static mbstate_t state_types[6] = {};
+
 _ALIGNAS_TYPE (__stdinbuf<char> ) static char __cin [sizeof(__stdinbuf <char>)];
 _ALIGNAS_TYPE (__stdoutbuf<char>) static char __cout[sizeof(__stdoutbuf<char>)];
 _ALIGNAS_TYPE (__stdoutbuf<char>) static char __cerr[sizeof(__stdoutbuf<char>)];
@@ -33,17 +35,17 @@
 
 ios_base::Init::Init()
 {
-    istream* cin_ptr  = ::new(cin)  istream(::new(__cin)  __stdinbuf <char>(stdin) );
-    ostream* cout_ptr = ::new(cout) ostream(::new(__cout) __stdoutbuf<char>(stdout));
-    ostream* cerr_ptr = ::new(cerr) ostream(::new(__cerr) __stdoutbuf<char>(stderr));
+    istream* cin_ptr  = ::new(cin)  istream(::new(__cin)  __stdinbuf <char>(stdin, state_types+0) );
+    ostream* cout_ptr = ::new(cout) ostream(::new(__cout) __stdoutbuf<char>(stdout, state_types+1));
+    ostream* cerr_ptr = ::new(cerr) ostream(::new(__cerr) __stdoutbuf<char>(stderr, state_types+2));
                         ::new(clog) ostream(cerr_ptr->rdbuf());
     cin_ptr->tie(cout_ptr);
     _VSTD::unitbuf(*cerr_ptr);
     cerr_ptr->tie(cout_ptr);
 
-    wistream* wcin_ptr  = ::new(wcin)  wistream(::new(__wcin)  __stdinbuf <wchar_t>(stdin) );
-    wostream* wcout_ptr = ::new(wcout) wostream(::new(__wcout) __stdoutbuf<wchar_t>(stdout));
-    wostream* wcerr_ptr = ::new(wcerr) wostream(::new(__wcerr) __stdoutbuf<wchar_t>(stderr));
+    wistream* wcin_ptr  = ::new(wcin)  wistream(::new(__wcin)  __stdinbuf <wchar_t>(stdin, state_types+3) );
+    wostream* wcout_ptr = ::new(wcout) wostream(::new(__wcout) __stdoutbuf<wchar_t>(stdout, state_types+4));
+    wostream* wcerr_ptr = ::new(wcerr) wostream(::new(__wcerr) __stdoutbuf<wchar_t>(stderr, state_types+5));
                           ::new(wclog) wostream(wcerr_ptr->rdbuf());
     wcin_ptr->tie(wcout_ptr);
     _VSTD::unitbuf(*wcerr_ptr);
@@ -52,13 +54,13 @@
 
 ios_base::Init::~Init()
 {
-    ostream* cout_ptr = (ostream*)cout;
-    ostream* clog_ptr = (ostream*)clog;
+    ostream* cout_ptr = reinterpret_cast<ostream*>(cout);
+    ostream* clog_ptr = reinterpret_cast<ostream*>(clog);
     cout_ptr->flush();
     clog_ptr->flush();
 
-    wostream* wcout_ptr = (wostream*)wcout;
-    wostream* wclog_ptr = (wostream*)wclog;
+    wostream* wcout_ptr = reinterpret_cast<wostream*>(wcout);
+    wostream* wclog_ptr = reinterpret_cast<wostream*>(wclog);
     wcout_ptr->flush();
     wclog_ptr->flush();
 }
diff --git a/sources/cxx-stl/llvm-libc++/src/locale.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/locale.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/src/locale.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/locale.cpp
index e4c40de..5667f8d 100644
--- a/sources/cxx-stl/llvm-libc++/src/locale.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/src/locale.cpp
@@ -25,13 +25,17 @@
 #include "cstring"
 #include "cwctype"
 #include "__sso_allocator"
-#if _WIN32
+#ifdef _WIN32
 #include <support/win32/locale_win32.h>
 #else // _WIN32
 #include <langinfo.h>
 #endif // _!WIN32
 #include <stdlib.h>
 
+// On Linux, wint_t and wchar_t have different signed-ness, and this causes
+// lots of noise in the build log, but no bugs that I know of. 
+#pragma clang diagnostic ignored "-Wsign-conversion"
+
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 #ifdef __cloc_defined
@@ -782,7 +786,7 @@
 {
 #ifdef _LIBCPP_HAS_DEFAULTRUNELOCALE
     return isascii(c) ? _DefaultRuneLocale.__mapupper[c] : c;
-#elif defined(__GLIBC__)
+#elif defined(__GLIBC__) || defined(EMSCRIPTEN)
     return isascii(c) ? ctype<char>::__classic_upper_table()[c] : c;
 #else
     return (isascii(c) && iswlower_l(c, __cloc())) ? c-L'a'+L'A' : c;
@@ -795,7 +799,7 @@
     for (; low != high; ++low)
 #ifdef _LIBCPP_HAS_DEFAULTRUNELOCALE
         *low = isascii(*low) ? _DefaultRuneLocale.__mapupper[*low] : *low;
-#elif defined(__GLIBC__)
+#elif defined(__GLIBC__) || defined(EMSCRIPTEN)
         *low = isascii(*low) ? ctype<char>::__classic_upper_table()[*low]
                              : *low;
 #else
@@ -809,7 +813,7 @@
 {
 #ifdef _LIBCPP_HAS_DEFAULTRUNELOCALE
     return isascii(c) ? _DefaultRuneLocale.__maplower[c] : c;
-#elif defined(__GLIBC__)
+#elif defined(__GLIBC__) || defined(EMSCRIPTEN)
     return isascii(c) ? ctype<char>::__classic_lower_table()[c] : c;
 #else
     return (isascii(c) && isupper_l(c, __cloc())) ? c-L'A'+'a' : c;
@@ -822,7 +826,7 @@
     for (; low != high; ++low)
 #ifdef _LIBCPP_HAS_DEFAULTRUNELOCALE
         *low = isascii(*low) ? _DefaultRuneLocale.__maplower[*low] : *low;
-#elif defined(__GLIBC__)
+#elif defined(__GLIBC__) || defined(EMSCRIPTEN)
         *low = isascii(*low) ? ctype<char>::__classic_lower_table()[*low]
                              : *low;
 #else
@@ -889,8 +893,9 @@
 #ifdef _LIBCPP_HAS_DEFAULTRUNELOCALE
     return isascii(c) ?
       static_cast<char>(_DefaultRuneLocale.__mapupper[static_cast<ptrdiff_t>(c)]) : c;
-#elif defined(__GLIBC__)
-    return isascii(c) ? __classic_upper_table()[static_cast<size_t>(c)] : c;
+#elif defined(__GLIBC__) || defined(EMSCRIPTEN)
+    return isascii(c) ? 
+      static_cast<char>(__classic_upper_table()[static_cast<size_t>(c)]) : c;
 #else
     return (isascii(c) && islower_l(c, __cloc())) ? c-'a'+'A' : c;
 #endif
@@ -903,8 +908,9 @@
 #ifdef _LIBCPP_HAS_DEFAULTRUNELOCALE
         *low = isascii(*low) ?
           static_cast<char>(_DefaultRuneLocale.__mapupper[static_cast<ptrdiff_t>(*low)]) : *low;
-#elif defined(__GLIBC__)
-        *low = isascii(*low) ? __classic_upper_table()[static_cast<size_t>(*low)] : *low;
+#elif defined(__GLIBC__) || defined(EMSCRIPTEN)
+        *low = isascii(*low) ?
+          static_cast<char>(__classic_upper_table()[static_cast<size_t>(*low)]) : *low;
 #else
         *low = (isascii(*low) && islower_l(*low, __cloc())) ? *low-'a'+'A' : *low;
 #endif
@@ -917,8 +923,9 @@
 #ifdef _LIBCPP_HAS_DEFAULTRUNELOCALE
     return isascii(c) ?
       static_cast<char>(_DefaultRuneLocale.__maplower[static_cast<ptrdiff_t>(c)]) : c;
-#elif defined(__GLIBC__)
-    return isascii(c) ? __classic_lower_table()[static_cast<size_t>(c)] : c;
+#elif defined(__GLIBC__) || defined(EMSCRIPTEN)
+    return isascii(c) ?
+      static_cast<char>(__classic_lower_table()[static_cast<size_t>(c)]) : c;
 #else
     return (isascii(c) && isupper_l(c, __cloc())) ? c-'A'+'a' : c;
 #endif
@@ -930,8 +937,8 @@
     for (; low != high; ++low)
 #ifdef _LIBCPP_HAS_DEFAULTRUNELOCALE
         *low = isascii(*low) ? static_cast<char>(_DefaultRuneLocale.__maplower[static_cast<ptrdiff_t>(*low)]) : *low;
-#elif defined(__GLIBC__)
-        *low = isascii(*low) ? __classic_lower_table()[static_cast<size_t>(*low)] : *low;
+#elif defined(__GLIBC__) || defined(EMSCRIPTEN)
+        *low = isascii(*low) ? static_cast<char>(__classic_lower_table()[static_cast<size_t>(*low)]) : *low;
 #else
         *low = (isascii(*low) && isupper_l(*low, __cloc())) ? *low-'A'+'a' : *low;
 #endif
@@ -971,6 +978,12 @@
     return low;
 }
 
+#ifdef EMSCRIPTEN
+extern "C" const unsigned short ** __ctype_b_loc();
+extern "C" const int ** __ctype_tolower_loc();
+extern "C" const int ** __ctype_toupper_loc();
+#endif
+
 const ctype<char>::mask*
 ctype<char>::classic_table()  _NOEXCEPT
 {
@@ -985,10 +998,12 @@
     return __ctype_c_mask_table;
 #elif __sun__
     return __ctype_mask;
-#elif _WIN32
+#elif defined(_WIN32)
     return _ctype+1; // internal ctype mask table defined in msvcrt.dll
 // This is assumed to be safe, which is a nonsense assumption because we're
 // going to end up dereferencing it later...
+#elif defined(EMSCRIPTEN)
+    return *__ctype_b_loc();
 #else
     // Platform not supported: abort so the person doing the port knows what to
     // fix
@@ -1012,6 +1027,20 @@
 }
 #endif // __GLIBC__
 
+#if defined(EMSCRIPTEN)
+const int*
+ctype<char>::__classic_lower_table() _NOEXCEPT
+{
+    return *__ctype_tolower_loc();
+}
+
+const int*
+ctype<char>::__classic_upper_table() _NOEXCEPT
+{
+    return *__ctype_toupper_loc();
+}
+#endif // EMSCRIPTEN
+
 // template <> class ctype_byname<char>
 
 ctype_byname<char>::ctype_byname(const char* name, size_t refs)
@@ -1105,16 +1134,17 @@
     return static_cast<bool>(iswctype_l(c, m, __l));
 #else
     bool result = false;
-    if (m & space) result |= (iswspace_l(c, __l) != 0);
-    if (m & print) result |= (iswprint_l(c, __l) != 0);
-    if (m & cntrl) result |= (iswcntrl_l(c, __l) != 0);
-    if (m & upper) result |= (iswupper_l(c, __l) != 0);
-    if (m & lower) result |= (iswlower_l(c, __l) != 0);
-    if (m & alpha) result |= (iswalpha_l(c, __l) != 0);
-    if (m & digit) result |= (iswdigit_l(c, __l) != 0);
-    if (m & punct) result |= (iswpunct_l(c, __l) != 0);
-    if (m & xdigit) result |= (iswxdigit_l(c, __l) != 0);
-    if (m & blank) result |= (iswblank_l(c, __l) != 0);
+    wint_t ch = static_cast<wint_t>(c);
+    if (m & space) result |= (iswspace_l(ch, __l) != 0);
+    if (m & print) result |= (iswprint_l(ch, __l) != 0);
+    if (m & cntrl) result |= (iswcntrl_l(ch, __l) != 0);
+    if (m & upper) result |= (iswupper_l(ch, __l) != 0);
+    if (m & lower) result |= (iswlower_l(ch, __l) != 0);
+    if (m & alpha) result |= (iswalpha_l(ch, __l) != 0);
+    if (m & digit) result |= (iswdigit_l(ch, __l) != 0);
+    if (m & punct) result |= (iswpunct_l(ch, __l) != 0);
+    if (m & xdigit) result |= (iswxdigit_l(ch, __l) != 0);
+    if (m & blank) result |= (iswblank_l(ch, __l) != 0);
     return result;
 #endif
 }
@@ -1129,23 +1159,24 @@
         else
         {
             *vec = 0;
-            if (iswspace_l(*low, __l))
+            wint_t ch = static_cast<wint_t>(*low);
+            if (iswspace_l(ch, __l))
                 *vec |= space;
-            if (iswprint_l(*low, __l))
+            if (iswprint_l(ch, __l))
                 *vec |= print;
-            if (iswcntrl_l(*low, __l))
+            if (iswcntrl_l(ch, __l))
                 *vec |= cntrl;
-            if (iswupper_l(*low, __l))
+            if (iswupper_l(ch, __l))
                 *vec |= upper;
-            if (iswlower_l(*low, __l))
+            if (iswlower_l(ch, __l))
                 *vec |= lower;
-            if (iswalpha_l(*low, __l))
+            if (iswalpha_l(ch, __l))
                 *vec |= alpha;
-            if (iswdigit_l(*low, __l))
+            if (iswdigit_l(ch, __l))
                 *vec |= digit;
-            if (iswpunct_l(*low, __l))
+            if (iswpunct_l(ch, __l))
                 *vec |= punct;
-            if (iswxdigit_l(*low, __l))
+            if (iswxdigit_l(ch, __l))
                 *vec |= xdigit;
         }
     }
@@ -1161,16 +1192,17 @@
         if (iswctype_l(*low, m, __l))
             break;
 #else
-        if (m & space && iswspace_l(*low, __l)) break;
-        if (m & print && iswprint_l(*low, __l)) break;
-        if (m & cntrl && iswcntrl_l(*low, __l)) break;
-        if (m & upper && iswupper_l(*low, __l)) break;
-        if (m & lower && iswlower_l(*low, __l)) break;
-        if (m & alpha && iswalpha_l(*low, __l)) break;
-        if (m & digit && iswdigit_l(*low, __l)) break;
-        if (m & punct && iswpunct_l(*low, __l)) break;
-        if (m & xdigit && iswxdigit_l(*low, __l)) break;
-        if (m & blank && iswblank_l(*low, __l)) break;
+        wint_t ch = static_cast<wint_t>(*low);
+        if (m & space && iswspace_l(ch, __l)) break;
+        if (m & print && iswprint_l(ch, __l)) break;
+        if (m & cntrl && iswcntrl_l(ch, __l)) break;
+        if (m & upper && iswupper_l(ch, __l)) break;
+        if (m & lower && iswlower_l(ch, __l)) break;
+        if (m & alpha && iswalpha_l(ch, __l)) break;
+        if (m & digit && iswdigit_l(ch, __l)) break;
+        if (m & punct && iswpunct_l(ch, __l)) break;
+        if (m & xdigit && iswxdigit_l(ch, __l)) break;
+        if (m & blank && iswblank_l(ch, __l)) break;
 #endif
     }
     return low;
@@ -1185,16 +1217,17 @@
         if (!iswctype_l(*low, m, __l))
             break;
 #else
-        if (m & space && iswspace_l(*low, __l)) continue;
-        if (m & print && iswprint_l(*low, __l)) continue;
-        if (m & cntrl && iswcntrl_l(*low, __l)) continue;
-        if (m & upper && iswupper_l(*low, __l)) continue;
-        if (m & lower && iswlower_l(*low, __l)) continue;
-        if (m & alpha && iswalpha_l(*low, __l)) continue;
-        if (m & digit && iswdigit_l(*low, __l)) continue;
-        if (m & punct && iswpunct_l(*low, __l)) continue;
-        if (m & xdigit && iswxdigit_l(*low, __l)) continue;
-        if (m & blank && iswblank_l(*low, __l)) continue;
+        wint_t ch = static_cast<wint_t>(*low);
+        if (m & space && iswspace_l(ch, __l)) continue;
+        if (m & print && iswprint_l(ch, __l)) continue;
+        if (m & cntrl && iswcntrl_l(ch, __l)) continue;
+        if (m & upper && iswupper_l(ch, __l)) continue;
+        if (m & lower && iswlower_l(ch, __l)) continue;
+        if (m & alpha && iswalpha_l(ch, __l)) continue;
+        if (m & digit && iswdigit_l(ch, __l)) continue;
+        if (m & punct && iswpunct_l(ch, __l)) continue;
+        if (m & xdigit && iswxdigit_l(ch, __l)) continue;
+        if (m & blank && iswblank_l(ch, __l)) continue;
         break;
 #endif
     }
@@ -1379,7 +1412,7 @@
     to_nxt = to;
     for (frm_nxt = frm; frm != frm_end && to != to_end; frm = frm_nxt, to = to_nxt)
     {
-        // save state in case needed to reover to_nxt on error
+        // save state in case it is needed to recover to_nxt on error
         mbstate_t save_state = st;
 #ifdef _LIBCPP_LOCALE__L_EXTENSIONS
         size_t n = wcsnrtombs_l(to, &frm_nxt, static_cast<size_t>(fend-frm),
@@ -1448,7 +1481,7 @@
     to_nxt = to;
     for (frm_nxt = frm; frm != frm_end && to != to_end; frm = frm_nxt, to = to_nxt)
     {
-        // save state in case needed to reover to_nxt on error
+        // save state in case it is needed to recover to_nxt on error
         mbstate_t save_state = st;
 #ifdef _LIBCPP_LOCALE__L_EXTENSIONS
         size_t n = mbsnrtowcs_l(to, &frm_nxt, static_cast<size_t>(fend-frm),
@@ -1594,9 +1627,9 @@
 codecvt<wchar_t, char, mbstate_t>::do_max_length() const  _NOEXCEPT
 {
 #ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-    return __l == 0 ? 1 : MB_CUR_MAX_L(__l);
+    return __l == 0 ? 1 : static_cast<int>(  MB_CUR_MAX_L(__l));
 #else
-    return __l == 0 ? 1 : __mb_cur_max_l(__l);
+    return __l == 0 ? 1 : static_cast<int>(__mb_cur_max_l(__l));
 #endif
 }
 
@@ -5773,7 +5806,7 @@
         __frac_digits_ = lc->int_frac_digits;
     else
         __frac_digits_ = base::do_frac_digits();
-#if _WIN32
+#ifdef _WIN32
     if (lc->p_sign_posn == 0)
 #else // _WIN32
     if (lc->int_p_sign_posn == 0)
@@ -5781,7 +5814,7 @@
         __positive_sign_ = "()";
     else
         __positive_sign_ = lc->positive_sign;
-#if _WIN32
+#ifdef _WIN32
     if(lc->n_sign_posn == 0)
 #else // _WIN32
     if (lc->int_n_sign_posn == 0)
@@ -5793,7 +5826,7 @@
     // the same places in curr_symbol since there's no way to
     // represent anything else.
     string_type __dummy_curr_symbol = __curr_symbol_;
-#if _WIN32
+#ifdef _WIN32
     __init_pat(__pos_format_, __dummy_curr_symbol, true,
                lc->p_cs_precedes, lc->p_sep_by_space, lc->p_sign_posn, ' ');
     __init_pat(__neg_format_, __curr_symbol_, true,
@@ -5932,7 +5965,7 @@
         __frac_digits_ = lc->int_frac_digits;
     else
         __frac_digits_ = base::do_frac_digits();
-#if _WIN32
+#ifdef _WIN32
     if (lc->p_sign_posn == 0)
 #else // _WIN32
     if (lc->int_p_sign_posn == 0)
@@ -5952,7 +5985,7 @@
         wbe = wbuf + j;
         __positive_sign_.assign(wbuf, wbe);
     }
-#if _WIN32
+#ifdef _WIN32
     if (lc->n_sign_posn == 0)
 #else // _WIN32
     if (lc->int_n_sign_posn == 0)
@@ -5976,7 +6009,7 @@
     // the same places in curr_symbol since there's no way to
     // represent anything else.
     string_type __dummy_curr_symbol = __curr_symbol_;
-#if _WIN32
+#ifdef _WIN32
     __init_pat(__pos_format_, __dummy_curr_symbol, true,
                lc->p_cs_precedes, lc->p_sep_by_space, lc->p_sign_posn, L' ');
     __init_pat(__neg_format_, __curr_symbol_, true,
@@ -5997,6 +6030,8 @@
 {
 #ifndef _LIBCPP_NO_EXCEPTIONS
     throw runtime_error(msg);
+#else
+    (void)msg;
 #endif
 }
 
diff --git a/sources/cxx-stl/llvm-libc++/src/memory.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/memory.cpp
similarity index 87%
rename from sources/cxx-stl/llvm-libc++/src/memory.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/memory.cpp
index 14084a5..98bcc86 100644
--- a/sources/cxx-stl/llvm-libc++/src/memory.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/src/memory.cpp
@@ -122,7 +122,15 @@
 #if __has_feature(cxx_atomic)
 
 static const std::size_t __sp_mut_count = 16;
-static mutex mut_back[__sp_mut_count];
+static pthread_mutex_t mut_back_imp[__sp_mut_count] =
+{
+    PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
+    PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
+    PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
+    PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER
+};
+
+static mutex* mut_back = reinterpret_cast<std::mutex*>(mut_back_imp);
 
 _LIBCPP_CONSTEXPR __sp_mut::__sp_mut(void* p) _NOEXCEPT
    : __lx(p)
diff --git a/sources/cxx-stl/llvm-libc++/src/mutex.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/mutex.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/mutex.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/mutex.cpp
diff --git a/sources/cxx-stl/llvm-libc++/src/new.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/new.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/src/new.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/new.cpp
index 3ad593a..cf1d3c0 100644
--- a/sources/cxx-stl/llvm-libc++/src/new.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/src/new.cpp
@@ -15,7 +15,7 @@
 #define __has_include(inc) 0
 #endif
 
-#if __APPLE__
+#ifdef __APPLE__
     #include <cxxabi.h>
 
     #ifndef _LIBCPPABI_VERSION
@@ -144,15 +144,19 @@
 namespace std
 {
 
+#ifndef GABIXX_LIBCXX
 const nothrow_t nothrow = {};
+#endif
 
-#ifndef _LIBCPPABI_VERSION
+#if !defined(_LIBCPPABI_VERSION)
 
+#if !defined(GABIXX_LIBCXX)
 new_handler
 set_new_handler(new_handler handler) _NOEXCEPT
 {
     return __sync_lock_test_and_set(&__new_handler, handler);
 }
+#endif
 
 new_handler
 get_new_handler() _NOEXCEPT
@@ -160,7 +164,7 @@
     return __sync_fetch_and_add(&__new_handler, (new_handler)0);
 }
 
-#ifndef LIBCXXRT
+#if !defined(LIBCXXRT)
 
 bad_alloc::bad_alloc() _NOEXCEPT
 {
@@ -176,7 +180,7 @@
     return "std::bad_alloc";
 }
 
-#endif //LIBCXXRT
+#endif // !LIBCXXRT
 
 bad_array_new_length::bad_array_new_length() _NOEXCEPT
 {
@@ -192,7 +196,7 @@
     return "bad_array_new_length";
 }
 
-#endif
+#endif // !_LIBCPPABI_VERSION && !GABIXX_LIBCXX
 
 void
 __throw_bad_alloc()
diff --git a/sources/cxx-stl/llvm-libc++/src/random.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/random.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/random.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/random.cpp
diff --git a/sources/cxx-stl/llvm-libc++/src/regex.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/regex.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/regex.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/regex.cpp
diff --git a/sources/cxx-stl/llvm-libc++/src/stdexcept.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/stdexcept.cpp
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/src/stdexcept.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/stdexcept.cpp
index 660ebfe..0c4e832 100644
--- a/sources/cxx-stl/llvm-libc++/src/stdexcept.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/src/stdexcept.cpp
@@ -20,7 +20,7 @@
 #define __has_include(inc) 0
 #endif
 
-#if __APPLE__
+#ifdef __APPLE__
 #include <cxxabi.h>
 #elif defined(LIBCXXRT) || __has_include(<cxxabi.h>)
 #include <cxxabi.h>
diff --git a/sources/cxx-stl/llvm-libc++/src/string.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/string.cpp
similarity index 92%
rename from sources/cxx-stl/llvm-libc++/src/string.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/string.cpp
index b4449eb..c71af4f 100644
--- a/sources/cxx-stl/llvm-libc++/src/string.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/src/string.cpp
@@ -11,7 +11,7 @@
 #include "cstdlib"
 #include "cwchar"
 #include "cerrno"
-#if _WIN32
+#ifdef _WIN32
 #include "support/win32/support.h"
 #endif // _WIN32
 
@@ -26,30 +26,12 @@
     string
     operator+<char, char_traits<char>, allocator<char> >(char const*, string const&);
 
-#ifdef __ANDROID__
-
-namespace {
-
-// Private helper function used in place of std::swap() to handle the case
-// where errno is declared as a volatile int (making std::swap inappropriate
-// since its two parameters have different types, volatile int vs int).
-template <typename A, typename B>
-inline _LIBCPP_INLINE_VISIBILITY void swap(A& a, B& b) {
-  A a_copy = a;
-  a = b;
-  b = a_copy;
-}
-
-}  // namespace
-
-#endif  // __ANDROID__
-
 int
 stoi(const string& str, size_t* idx, int base)
 {
     char* ptr;
     const char* const p = str.c_str();
-    int errno_save = errno;
+    typename remove_reference<decltype(errno)>::type errno_save = errno;
     errno = 0;
     long r = strtol(p, &ptr, base);
     swap(errno, errno_save);
@@ -70,7 +52,7 @@
 {
     wchar_t* ptr;
     const wchar_t* const p = str.c_str();
-    int errno_save = errno;
+    typename remove_reference<decltype(errno)>::type errno_save = errno;
     errno = 0;
     long r = wcstol(p, &ptr, base);
     swap(errno, errno_save);
@@ -91,7 +73,7 @@
 {
     char* ptr;
     const char* const p = str.c_str();
-    int errno_save = errno;
+    typename remove_reference<decltype(errno)>::type errno_save = errno;
     errno = 0;
     long r = strtol(p, &ptr, base);
     swap(errno, errno_save);
@@ -111,7 +93,7 @@
 {
     wchar_t* ptr;
     const wchar_t* const p = str.c_str();
-    int errno_save = errno;
+    typename remove_reference<decltype(errno)>::type errno_save = errno;
     errno = 0;
     long r = wcstol(p, &ptr, base);
     swap(errno, errno_save);
@@ -131,7 +113,7 @@
 {
     char* ptr;
     const char* const p = str.c_str();
-    int errno_save = errno;
+    typename remove_reference<decltype(errno)>::type errno_save = errno;
     errno = 0;
     unsigned long r = strtoul(p, &ptr, base);
     swap(errno, errno_save);
@@ -151,7 +133,7 @@
 {
     wchar_t* ptr;
     const wchar_t* const p = str.c_str();
-    int errno_save = errno;
+    typename remove_reference<decltype(errno)>::type errno_save = errno;
     errno = 0;
     unsigned long r = wcstoul(p, &ptr, base);
     swap(errno, errno_save);
@@ -171,7 +153,7 @@
 {
     char* ptr;
     const char* const p = str.c_str();
-    int errno_save = errno;
+    typename remove_reference<decltype(errno)>::type errno_save = errno;
     errno = 0;
     long long r = strtoll(p, &ptr, base);
     swap(errno, errno_save);
@@ -191,7 +173,7 @@
 {
     wchar_t* ptr;
     const wchar_t* const p = str.c_str();
-    int errno_save = errno;
+    typename remove_reference<decltype(errno)>::type errno_save = errno;
     errno = 0;
     long long r = wcstoll(p, &ptr, base);
     swap(errno, errno_save);
@@ -211,7 +193,7 @@
 {
     char* ptr;
     const char* const p = str.c_str();
-    int errno_save = errno;
+    typename remove_reference<decltype(errno)>::type errno_save = errno;
     errno = 0;
     unsigned long long r = strtoull(p, &ptr, base);
     swap(errno, errno_save);
@@ -231,7 +213,7 @@
 {
     wchar_t* ptr;
     const wchar_t* const p = str.c_str();
-    int errno_save = errno;
+    typename remove_reference<decltype(errno)>::type errno_save = errno;
     errno = 0;
     unsigned long long r = wcstoull(p, &ptr, base);
     swap(errno, errno_save);
@@ -251,7 +233,7 @@
 {
     char* ptr;
     const char* const p = str.c_str();
-    int errno_save = errno;
+    typename remove_reference<decltype(errno)>::type errno_save = errno;
     errno = 0;
     float r = strtof(p, &ptr);
     swap(errno, errno_save);
@@ -271,7 +253,7 @@
 {
     wchar_t* ptr;
     const wchar_t* const p = str.c_str();
-    int errno_save = errno;
+    typename remove_reference<decltype(errno)>::type errno_save = errno;
     errno = 0;
     float r = wcstof(p, &ptr);
     swap(errno, errno_save);
@@ -291,7 +273,7 @@
 {
     char* ptr;
     const char* const p = str.c_str();
-    int errno_save = errno;
+    typename remove_reference<decltype(errno)>::type errno_save = errno;
     errno = 0;
     double r = strtod(p, &ptr);
     swap(errno, errno_save);
@@ -311,7 +293,7 @@
 {
     wchar_t* ptr;
     const wchar_t* const p = str.c_str();
-    int errno_save = errno;
+    typename remove_reference<decltype(errno)>::type errno_save = errno;
     errno = 0;
     double r = wcstod(p, &ptr);
     swap(errno, errno_save);
@@ -331,7 +313,7 @@
 {
     char* ptr;
     const char* const p = str.c_str();
-    int errno_save = errno;
+    typename remove_reference<decltype(errno)>::type errno_save = errno;
     errno = 0;
     long double r = strtold(p, &ptr);
     swap(errno, errno_save);
@@ -351,7 +333,7 @@
 {
     wchar_t* ptr;
     const wchar_t* const p = str.c_str();
-    int errno_save = errno;
+    typename remove_reference<decltype(errno)>::type errno_save = errno;
     errno = 0;
     long double r = wcstold(p, &ptr);
     swap(errno, errno_save);
diff --git a/sources/cxx-stl/llvm-libc++/src/strstream.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/strstream.cpp
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/src/strstream.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/strstream.cpp
index 8cd19e6..518422b 100644
--- a/sources/cxx-stl/llvm-libc++/src/strstream.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/src/strstream.cpp
@@ -158,6 +158,8 @@
             return int_type(EOF);
         streamsize old_size = (epptr() ? epptr() : egptr()) - eback();
         streamsize new_size = max<streamsize>(__alsize_, 2*old_size);
+        if (new_size == 0)
+            new_size = __default_alsize;
         char* buf = nullptr;
         if (__palloc_)
             buf = static_cast<char*>(__palloc_(static_cast<size_t>(new_size)));
diff --git a/sources/cxx-stl/llvm-libc++/src/support/solaris/README b/sources/cxx-stl/llvm-libc++/libcxx/src/support/solaris/README
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/support/solaris/README
rename to sources/cxx-stl/llvm-libc++/libcxx/src/support/solaris/README
diff --git a/sources/cxx-stl/llvm-libc++/src/support/solaris/mbsnrtowcs.inc b/sources/cxx-stl/llvm-libc++/libcxx/src/support/solaris/mbsnrtowcs.inc
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/support/solaris/mbsnrtowcs.inc
rename to sources/cxx-stl/llvm-libc++/libcxx/src/support/solaris/mbsnrtowcs.inc
diff --git a/sources/cxx-stl/llvm-libc++/src/support/solaris/wcsnrtombs.inc b/sources/cxx-stl/llvm-libc++/libcxx/src/support/solaris/wcsnrtombs.inc
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/support/solaris/wcsnrtombs.inc
rename to sources/cxx-stl/llvm-libc++/libcxx/src/support/solaris/wcsnrtombs.inc
diff --git a/sources/cxx-stl/llvm-libc++/src/support/solaris/xlocale.c b/sources/cxx-stl/llvm-libc++/libcxx/src/support/solaris/xlocale.c
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/support/solaris/xlocale.c
rename to sources/cxx-stl/llvm-libc++/libcxx/src/support/solaris/xlocale.c
diff --git a/sources/cxx-stl/llvm-libc++/src/support/win32/locale_win32.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/support/win32/locale_win32.cpp
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/src/support/win32/locale_win32.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/support/win32/locale_win32.cpp
index 02b5874..e8c630c 100644
--- a/sources/cxx-stl/llvm-libc++/src/support/win32/locale_win32.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/src/support/win32/locale_win32.cpp
@@ -20,6 +20,8 @@
 locale_t uselocale( locale_t newloc )
 {
     locale_t old_locale = _get_current_locale();
+    if ( newloc == NULL )
+        return old_locale;
     // uselocale sets the thread's locale by definition, so unconditionally use thread-local locale
     _configthreadlocale( _ENABLE_PER_THREAD_LOCALE );
     // uselocale sets all categories
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/src/support/win32/support.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/support/win32/support.cpp
new file mode 100644
index 0000000..75f6391
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/src/support/win32/support.cpp
@@ -0,0 +1,152 @@
+// -*- C++ -*-
+//===----------------------- support/win32/support.h ----------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include <support/win32/support.h>
+#include <stdarg.h> // va_start, va_end
+#include <stddef.h> // size_t
+#include <stdlib.h> // malloc
+#include <stdio.h>  // vsprintf, vsnprintf
+#include <string.h> // strcpy, wcsncpy
+
+int asprintf(char **sptr, const char *__restrict fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    int result = vasprintf(sptr, fmt, ap);
+    va_end(ap);
+    return result;
+}
+
+// Like sprintf, but when return value >= 0 it returns a pointer to a malloc'd string in *sptr.
+// If return >= 0, use free to delete *sptr.
+int vasprintf( char **sptr, const char *__restrict fmt, va_list ap )
+{
+    *sptr = NULL;
+    int count = vsnprintf( NULL, 0, fmt, ap ); // Query the buffer size required.
+    if( count >= 0 ) {
+        char* p = static_cast<char*>(malloc(count+1)); // Allocate memory for it and the terminator.
+        if ( p == NULL )
+            return -1;
+        if ( vsnprintf( p, count+1, fmt, ap ) == count ) // We should have used exactly what was required.
+            *sptr = p;
+        else { // Otherwise something is wrong, likely a bug in vsnprintf. If so free the memory and report the error.
+            free(p);
+            return -1;
+        }
+    }
+
+    return count;
+}
+
+// Returns >= 0: the number of wide characters found in the multi byte sequence src (of src_size_bytes),
+// that fit in the buffer dst (of max_dest_chars elements size). The count returned excludes the null terminator.
+// When dst is NULL, no characters are copied and no "out" parameters are updated.
+// Returns (size_t) -1: an incomplete sequence encountered.
+// Leaves *src pointing the next character to convert or NULL if a null character was converted from *src.
+size_t mbsnrtowcs( wchar_t *__restrict dst, const char **__restrict src,
+                   size_t src_size_bytes, size_t max_dest_chars, mbstate_t *__restrict ps )
+{
+    const size_t terminated_sequence = static_cast<size_t>(0);
+    //const size_t invalid_sequence = static_cast<size_t>(-1);
+    const size_t incomplete_sequence = static_cast< size_t>(-2);
+
+    size_t dest_converted = 0;
+    size_t source_converted = 0;
+    size_t source_remaining = src_size_bytes;
+    size_t result = 0;
+    bool have_result = false;
+
+    while ( source_remaining ) {
+        if ( dst && dest_converted >= max_dest_chars )
+            break;
+        // Converts one multi byte character.
+        // if result > 0, it's the size in bytes of that character.
+        // othewise if result is zero it indicates the null character has been found.
+        // otherwise it's an error and errno may be set.
+        size_t char_size = mbrtowc( dst ? dst + dest_converted : NULL, *src + source_converted, source_remaining, ps );
+        // Don't do anything to change errno from here on.
+        if ( char_size > 0 ) {
+            source_remaining -= char_size;
+            source_converted += char_size;
+            ++dest_converted;
+            continue;
+        }
+        result = char_size;
+        have_result = true;
+        break;
+    }
+    if ( dst ) {
+        if ( have_result && result == terminated_sequence )
+            *src = NULL;
+        else
+            *src += source_converted;
+    }
+    if ( have_result && result != terminated_sequence && result != incomplete_sequence )
+        return static_cast<size_t>(-1);
+
+    return dest_converted;
+}
+
+// Converts max_source_chars from the wide character buffer pointer to by *src,
+// into the multi byte character sequence buffer stored at dst which must be dst_size_bytes bytes in size.
+// Returns >= 0: the number of bytes in the sequence sequence converted frome *src, excluding the null terminator.
+// Returns size_t(-1) if an error occurs, also sets errno.
+// If dst is NULL dst_size_bytes is ignored and no bytes are copied to dst and no "out" parameters are updated.
+size_t wcsnrtombs( char *__restrict dst, const wchar_t **__restrict src,
+                   size_t max_source_chars, size_t dst_size_bytes, mbstate_t *__restrict ps )
+{
+    //const size_t invalid_sequence = static_cast<size_t>(-1);
+
+    size_t source_converted = 0;
+    size_t dest_converted = 0;
+    size_t dest_remaining = dst_size_bytes;
+    size_t char_size = 0;
+    const errno_t no_error = ( errno_t) 0;
+    errno_t result = ( errno_t ) 0;
+    bool have_result = false;
+    bool terminator_found = false;
+
+    while ( source_converted != max_source_chars ) {
+        if ( ! dest_remaining )
+            break;
+        wchar_t c = (*src)[source_converted];
+        if ( dst )
+            result = wcrtomb_s( &char_size, dst + dest_converted, dest_remaining, c, ps);
+        else
+            result = wcrtomb_s( &char_size, NULL, 0, c, ps); 
+        // If result is zero there is no error and char_size contains the size of the multi-byte-sequence converted.
+        // Otherwise result indicates an errno type error.
+        if ( result == no_error ) {
+            if ( c == L'\0' ) {
+                terminator_found = true;
+                break;
+            }
+            ++source_converted;
+            if ( dst )
+                dest_remaining -= char_size;
+            dest_converted += char_size;
+            continue;
+        }
+        have_result = true;
+        break;
+    }
+    if ( dst ) {
+        if ( terminator_found )
+            *src = NULL;
+        else
+            *src = *src + source_converted;
+    }
+    if ( have_result && result != no_error ) {
+        errno = result;
+        return static_cast<size_t>(-1);
+    }
+
+    return dest_converted;
+}
diff --git a/sources/cxx-stl/llvm-libc++/src/system_error.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/system_error.cpp
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/src/system_error.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/system_error.cpp
index 763d62c..7376b77 100644
--- a/sources/cxx-stl/llvm-libc++/src/system_error.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/src/system_error.cpp
@@ -195,6 +195,9 @@
 {
 #ifndef _LIBCPP_NO_EXCEPTIONS
     throw system_error(error_code(ev, system_category()), what_arg);
+#else
+    (void)ev;
+    (void)what_arg;
 #endif
 }
 
diff --git a/sources/cxx-stl/llvm-libc++/src/thread.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/thread.cpp
similarity index 92%
rename from sources/cxx-stl/llvm-libc++/src/thread.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/thread.cpp
index b2bd07e..c6f6748 100644
--- a/sources/cxx-stl/llvm-libc++/src/thread.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/src/thread.cpp
@@ -13,8 +13,8 @@
 #include "future"
 #include "limits"
 #include <sys/types.h>
-#if !_WIN32
-#if !__sun__ && !__linux__
+#if !defined(_WIN32)
+#if !defined(__sun__) && !defined(__linux__)
 #include <sys/sysctl.h>
 #else
 #include <unistd.h>
@@ -36,6 +36,8 @@
 #ifndef _LIBCPP_NO_EXCEPTIONS
     if (ec)
         throw system_error(error_code(ec, system_category()), "thread::join failed");
+#else
+    (void)ec;
 #endif  // _LIBCPP_NO_EXCEPTIONS
     __t_ = 0;
 }
@@ -65,13 +67,15 @@
     std::size_t s = sizeof(n);
     sysctl(mib, 2, &n, &s, 0, 0);
     return n;
-#elif defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L) && defined(_SC_NPROCESSORS_ONLN)
+#elif (defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L) && defined(_SC_NPROCESSORS_ONLN)) || defined(EMSCRIPTEN)
     long result = sysconf(_SC_NPROCESSORS_ONLN);
     // sysconf returns -1 if the name is invalid, the option does not exist or
     // does not have a definite limit.
-    if (result == -1)
+    // if sysconf returns some other negative number, we have no idea
+    // what is going on. Default to something safe.
+    if (result < 0)
         return 0;
-    return result;
+    return static_cast<unsigned>(result);
 #else  // defined(CTL_HW) && defined(HW_NCPU)
     // TODO: grovel through /proc or check cpuid on x86 and similar
     // instructions on other architectures.
diff --git a/sources/cxx-stl/llvm-libc++/src/typeinfo.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/typeinfo.cpp
similarity index 81%
rename from sources/cxx-stl/llvm-libc++/src/typeinfo.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/typeinfo.cpp
index 6bab077..6082894 100644
--- a/sources/cxx-stl/llvm-libc++/src/typeinfo.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/src/typeinfo.cpp
@@ -12,7 +12,7 @@
 #define __has_include(inc) 0
 #endif
 
-#if __APPLE__
+#ifdef __APPLE__
 #include <cxxabi.h>
 #elif defined(LIBCXXRT) || __has_include(<cxxabi.h>)
 #include <cxxabi.h>
@@ -50,11 +50,21 @@
   return "std::bad_typeid";
 }
 
-#if __APPLE__
+#ifdef __APPLE__
   // On Darwin, the cxa_bad_* functions cannot be in the lower level library
   // because bad_cast and bad_typeid are defined in his higher level library
-  void __cxxabiv1::__cxa_bad_typeid() { throw std::bad_typeid(); }
-  void __cxxabiv1::__cxa_bad_cast() { throw std::bad_cast(); }
+  void __cxxabiv1::__cxa_bad_typeid()
+  {
+#ifndef _LIBCPP_NO_EXCEPTIONS
+     throw std::bad_typeid();
+#endif
+  }
+  void __cxxabiv1::__cxa_bad_cast()
+  {
+#ifndef _LIBCPP_NO_EXCEPTIONS
+      throw std::bad_cast();
+#endif
+  }
 #endif
 
 #endif  // _LIBCPPABI_VERSION
diff --git a/sources/cxx-stl/llvm-libc++/src/utility.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/utility.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/utility.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/utility.cpp
diff --git a/sources/cxx-stl/llvm-libc++/src/valarray.cpp b/sources/cxx-stl/llvm-libc++/libcxx/src/valarray.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/src/valarray.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/src/valarray.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/CMakeLists.txt b/sources/cxx-stl/llvm-libc++/libcxx/test/CMakeLists.txt
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/CMakeLists.txt
rename to sources/cxx-stl/llvm-libc++/libcxx/test/CMakeLists.txt
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.c.library/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.c.library/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.c.library/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.c.library/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle_rand.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle_rand.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle_rand.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle_rand.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle_urng.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle_urng.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle_urng.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle_urng.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.swap/iter_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.swap/iter_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.swap/iter_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.swap/iter_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.modifying.operations/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.modifying.operations/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.count/count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.count/count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.count/count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.count/count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.find/find.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.search/search.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.search/search.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.search/search.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.search/search.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.search/search_n.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.search/search_n.pass.cpp
new file mode 100644
index 0000000..b834da2
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.search/search_n.pass.cpp
@@ -0,0 +1,73 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <algorithm>
+
+// template<class ForwardIterator, class Size, class T>
+//   ForwardIterator
+//   search_n(ForwardIterator first, ForwardIterator last, Size count,
+//            const T& value);
+
+#include <algorithm>
+#include <cassert>
+
+#include "test_iterators.h"
+
+template <class Iter>
+void
+test()
+{
+    int ia[] = {0, 1, 2, 3, 4, 5};
+    const unsigned sa = sizeof(ia)/sizeof(ia[0]);
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 0, 0) == Iter(ia));
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 1, 0) == Iter(ia+0));
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 2, 0) == Iter(ia+sa));
+    assert(std::search_n(Iter(ia), Iter(ia+sa), sa, 0) == Iter(ia+sa));
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 0, 3) == Iter(ia));
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 1, 3) == Iter(ia+3));
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 2, 3) == Iter(ia+sa));
+    assert(std::search_n(Iter(ia), Iter(ia+sa), sa, 3) == Iter(ia+sa));
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 0, 5) == Iter(ia));
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 1, 5) == Iter(ia+5));
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 2, 5) == Iter(ia+sa));
+    assert(std::search_n(Iter(ia), Iter(ia+sa), sa, 5) == Iter(ia+sa));
+
+    int ib[] = {0, 0, 1, 1, 2, 2};
+    const unsigned sb = sizeof(ib)/sizeof(ib[0]);
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 0, 0) == Iter(ib));
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 1, 0) == Iter(ib+0));
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 2, 0) == Iter(ib+0));
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 3, 0) == Iter(ib+sb));
+    assert(std::search_n(Iter(ib), Iter(ib+sb), sb, 0) == Iter(ib+sb));
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 0, 1) == Iter(ib));
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 1, 1) == Iter(ib+2));
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 2, 1) == Iter(ib+2));
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 3, 1) == Iter(ib+sb));
+    assert(std::search_n(Iter(ib), Iter(ib+sb), sb, 1) == Iter(ib+sb));
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 0, 2) == Iter(ib));
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 1, 2) == Iter(ib+4));
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 2, 2) == Iter(ib+4));
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 3, 2) == Iter(ib+sb));
+    assert(std::search_n(Iter(ib), Iter(ib+sb), sb, 2) == Iter(ib+sb));
+
+    int ic[] = {0, 0, 0};
+    const unsigned sc = sizeof(ic)/sizeof(ic[0]);
+    assert(std::search_n(Iter(ic), Iter(ic+sc), 0, 0) == Iter(ic));
+    assert(std::search_n(Iter(ic), Iter(ic+sc), 1, 0) == Iter(ic));
+    assert(std::search_n(Iter(ic), Iter(ic+sc), 2, 0) == Iter(ic));
+    assert(std::search_n(Iter(ic), Iter(ic+sc), 3, 0) == Iter(ic));
+    assert(std::search_n(Iter(ic), Iter(ic+sc), 4, 0) == Iter(ic+sc));
+}
+
+int main()
+{
+    test<forward_iterator<const int*> >();
+    test<bidirectional_iterator<const int*> >();
+    test<random_access_iterator<const int*> >();
+}
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp
new file mode 100644
index 0000000..6004b0e
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp
@@ -0,0 +1,148 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <algorithm>
+
+// template<class ForwardIterator, class Size, class T, class BinaryPredicate>
+//   ForwardIterator
+//   search_n(ForwardIterator first, ForwardIterator last, Size count,
+//            const T& value, BinaryPredicate pred);
+
+#include <algorithm>
+#include <cassert>
+
+#include "test_iterators.h"
+
+struct count_equal
+{
+    static unsigned count;
+    template <class T>
+    bool operator()(const T& x, const T& y)
+        {++count; return x == y;}
+};
+
+unsigned count_equal::count = 0;
+
+template <class Iter>
+void
+test()
+{
+    int ia[] = {0, 1, 2, 3, 4, 5};
+    const unsigned sa = sizeof(ia)/sizeof(ia[0]);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 0, 0, count_equal()) == Iter(ia));
+    assert(count_equal::count <= sa);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 1, 0, count_equal()) == Iter(ia+0));
+    assert(count_equal::count <= sa);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 2, 0, count_equal()) == Iter(ia+sa));
+    assert(count_equal::count <= sa);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ia), Iter(ia+sa), sa, 0, count_equal()) == Iter(ia+sa));
+    assert(count_equal::count <= sa);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 0, 3, count_equal()) == Iter(ia));
+    assert(count_equal::count <= sa);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 1, 3, count_equal()) == Iter(ia+3));
+    assert(count_equal::count <= sa);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 2, 3, count_equal()) == Iter(ia+sa));
+    assert(count_equal::count <= sa);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ia), Iter(ia+sa), sa, 3, count_equal()) == Iter(ia+sa));
+    assert(count_equal::count <= sa);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 0, 5, count_equal()) == Iter(ia));
+    assert(count_equal::count <= sa);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 1, 5, count_equal()) == Iter(ia+5));
+    assert(count_equal::count <= sa);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ia), Iter(ia+sa), 2, 5, count_equal()) == Iter(ia+sa));
+    assert(count_equal::count <= sa);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ia), Iter(ia+sa), sa, 5, count_equal()) == Iter(ia+sa));
+    assert(count_equal::count <= sa);
+    count_equal::count = 0;
+
+    int ib[] = {0, 0, 1, 1, 2, 2};
+    const unsigned sb = sizeof(ib)/sizeof(ib[0]);
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 0, 0, count_equal()) == Iter(ib));
+    assert(count_equal::count <= sb);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 1, 0, count_equal()) == Iter(ib+0));
+    assert(count_equal::count <= sb);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 2, 0, count_equal()) == Iter(ib+0));
+    assert(count_equal::count <= sb);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 3, 0, count_equal()) == Iter(ib+sb));
+    assert(count_equal::count <= sb);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ib), Iter(ib+sb), sb, 0, count_equal()) == Iter(ib+sb));
+    assert(count_equal::count <= sb);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 0, 1, count_equal()) == Iter(ib));
+    assert(count_equal::count <= sb);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 1, 1, count_equal()) == Iter(ib+2));
+    assert(count_equal::count <= sb);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 2, 1, count_equal()) == Iter(ib+2));
+    assert(count_equal::count <= sb);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 3, 1, count_equal()) == Iter(ib+sb));
+    assert(count_equal::count <= sb);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ib), Iter(ib+sb), sb, 1, count_equal()) == Iter(ib+sb));
+    assert(count_equal::count <= sb);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 0, 2, count_equal()) == Iter(ib));
+    assert(count_equal::count <= sb);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 1, 2, count_equal()) == Iter(ib+4));
+    assert(count_equal::count <= sb);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 2, 2, count_equal()) == Iter(ib+4));
+    assert(count_equal::count <= sb);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ib), Iter(ib+sb), 3, 2, count_equal()) == Iter(ib+sb));
+    assert(count_equal::count <= sb);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ib), Iter(ib+sb), sb, 2, count_equal()) == Iter(ib+sb));
+    assert(count_equal::count <= sb);
+    count_equal::count = 0;
+
+    int ic[] = {0, 0, 0};
+    const unsigned sc = sizeof(ic)/sizeof(ic[0]);
+    assert(std::search_n(Iter(ic), Iter(ic+sc), 0, 0, count_equal()) == Iter(ic));
+    assert(count_equal::count <= sc);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ic), Iter(ic+sc), 1, 0, count_equal()) == Iter(ic));
+    assert(count_equal::count <= sc);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ic), Iter(ic+sc), 2, 0, count_equal()) == Iter(ic));
+    assert(count_equal::count <= sc);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ic), Iter(ic+sc), 3, 0, count_equal()) == Iter(ic));
+    assert(count_equal::count <= sc);
+    count_equal::count = 0;
+    assert(std::search_n(Iter(ic), Iter(ic+sc), 4, 0, count_equal()) == Iter(ic+sc));
+    assert(count_equal::count <= sc);
+    count_equal::count = 0;
+}
+
+int main()
+{
+    test<forward_iterator<const int*> >();
+    test<bidirectional_iterator<const int*> >();
+    test<random_access_iterator<const int*> >();
+}
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.nonmodifying/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.nonmodifying/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/max_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/max_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/max_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/max_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/max_init_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/max_init_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/max_init_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/max_init_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/max_init_list_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/max_init_list_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/max_init_list_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/max_init_list_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/min_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/min_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/min_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/min_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/min_init_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/min_init_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/min_init_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/min_init_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/min_init_list_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/min_init_list_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/min_init_list_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/min_init_list_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/minmax.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/minmax.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/minmax_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/minmax_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/minmax_init_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_init_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/minmax_init_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_init_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/minmax_init_list_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_init_list_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.min.max/minmax_init_list_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.min.max/minmax_init_list_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.nth.element/nth_element.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.nth.element/nth_element.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.nth.element/nth_element.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.nth.element/nth_element.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/sort/sort_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/sort/sort_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/sort/sort_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/sort/sort_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/alg.sorting/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/alg.sorting/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/algorithms.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/algorithms.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/algorithms.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/algorithms.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/algorithms/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/algorithms/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/algorithms/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.fences/atomic_signal_fence.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.fences/atomic_signal_fence.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.fences/atomic_signal_fence.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.fences/atomic_signal_fence.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.fences/atomic_thread_fence.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.fences/atomic_thread_fence.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.fences/atomic_thread_fence.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.fences/atomic_thread_fence.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/atomic_flag_clear.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/atomic_flag_clear.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/atomic_flag_clear.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/atomic_flag_clear.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/atomic_flag_clear_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/atomic_flag_clear_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/atomic_flag_clear_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/atomic_flag_clear_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/atomic_flag_test_and_set.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/atomic_flag_test_and_set.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/atomic_flag_test_and_set.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/atomic_flag_test_and_set.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/atomic_flag_test_and_set_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/atomic_flag_test_and_set_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/atomic_flag_test_and_set_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/atomic_flag_test_and_set_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/clear.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/clear.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/clear.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/clear.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/copy_assign.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/copy_assign.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/copy_assign.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/copy_assign.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/copy_ctor.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/copy_ctor.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/copy_ctor.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/copy_ctor.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/copy_volatile_assign.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/copy_volatile_assign.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/copy_volatile_assign.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/copy_volatile_assign.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/test_and_set.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/test_and_set.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.flag/test_and_set.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.flag/test_and_set.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.lockfree/lockfree.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.lockfree/lockfree.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.lockfree/lockfree.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.lockfree/lockfree.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.order/kill_dependency.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.order/kill_dependency.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.order/kill_dependency.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.order/kill_dependency.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.order/memory_order.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.order/memory_order.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.order/memory_order.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.order/memory_order.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.syn/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.syn/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.syn/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.syn/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.generic/address.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.generic/address.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.generic/address.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.generic/address.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.generic/bool.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.generic/bool.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.generic/bool.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.generic/bool.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.generic/integral.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.generic/integral.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.generic/integral.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.generic/integral.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.generic/integral_typedefs.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.generic/integral_typedefs.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.generic/integral_typedefs.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.generic/integral_typedefs.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.arith/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.arith/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.arith/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.arith/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.pointer/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.pointer/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.pointer/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.pointer/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_is_lock_free.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_is_lock_free.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_is_lock_free.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_is_lock_free.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.templ/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.templ/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/atomics.types.operations.templ/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.templ/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/atomics.types.operations/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/atomics.types.operations/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/atomics/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/atomics/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/atomics/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/atomics/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/Copyable.h b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/Copyable.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/Copyable.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/Copyable.h
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/DefaultOnly.h b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/DefaultOnly.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/DefaultOnly.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/DefaultOnly.h
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/Emplaceable.h b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/Emplaceable.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/Emplaceable.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/Emplaceable.h
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/MoveOnly.h b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/MoveOnly.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/MoveOnly.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/MoveOnly.h
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/NotConstructible.h b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/NotConstructible.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/NotConstructible.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/NotConstructible.h
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.access/at.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.access/at.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.access/at.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.access/at.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.access/empty.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.access/empty.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.access/empty.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.access/empty.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.access/index_key.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.access/index_key.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.access/index_key.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.access/index_key.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.access/index_rv_key.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.access/index_rv_key.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.access/index_rv_key.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.access/index_rv_key.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.access/iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.access/iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.access/iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.access/iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.access/max_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.access/max_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.access/max_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.access/max_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.access/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.access/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.access/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.access/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/assign_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/compare_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/compare_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/compare_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/compare_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/copy_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/copy_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/copy_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/copy_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/copy_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/copy_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/default_recursive.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/default_recursive.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/default_recursive.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/default_recursive.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/initializer_list_compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/iter_iter_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/iter_iter_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/iter_iter_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/iter_iter_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/move_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/move_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/move_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/move_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.cons/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.cons/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/clear.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/clear.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/clear.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/clear.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/emplace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/emplace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/emplace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/emplace_hint.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/erase_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/erase_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/erase_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/erase_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/erase_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/erase_key.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/erase_key.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/erase_key.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/erase_key.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/insert_cv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/insert_cv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/insert_cv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/insert_cv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/insert_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/insert_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.modifiers/insert_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.ops/count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.ops/count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.ops/count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.ops/count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.ops/equal_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.ops/equal_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.ops/equal_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.ops/equal_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.ops/find.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.ops/find.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.ops/find.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.ops/find.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.ops/lower_bound.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.ops/lower_bound.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.ops/lower_bound.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.ops/lower_bound.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.ops/upper_bound.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.ops/upper_bound.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.ops/upper_bound.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.ops/upper_bound.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.special/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.special/member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.special/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.special/member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.special/non_member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.special/non_member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.special/non_member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.special/non_member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.special/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.special/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/map.special/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/map.special/swap_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/map/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/map/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/map/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/empty.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/empty.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/empty.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/empty.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/max_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/max_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/max_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/max_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/assign_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/compare_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/copy_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/initializer_list_compare_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/iter_iter_comp_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/move_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/clear.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/clear.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/clear.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/clear.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/emplace_hint.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/erase_key.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.ops/count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.ops/count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.ops/count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.ops/count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.ops/equal_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.ops/equal_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.ops/equal_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.ops/equal_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.ops/find.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.ops/find.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.ops/find.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.ops/find.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.special/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.special/member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.special/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.special/member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multimap/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multimap/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/clear.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/clear.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/clear.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/clear.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/emplace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/emplace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/emplace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/emplace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/emplace_hint.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/emplace_hint.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/emplace_hint.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/empty.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/empty.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/empty.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/empty.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/equal_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/equal_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/equal_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/equal_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/erase_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/erase_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/erase_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/erase_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/erase_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/erase_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/erase_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/erase_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/erase_key.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/erase_key.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/erase_key.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/erase_key.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/find.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/find.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/find.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/find.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/insert_cv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/insert_cv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/insert_cv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/insert_cv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/insert_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/insert_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/insert_iter_cv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/insert_iter_cv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/insert_iter_cv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/insert_iter_cv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/insert_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/insert_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/insert_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/insert_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/insert_iter_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/insert_iter_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/insert_iter_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/insert_iter_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/insert_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/insert_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/insert_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/insert_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/lower_bound.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/lower_bound.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/lower_bound.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/lower_bound.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/max_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/max_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/max_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/max_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/compare_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/copy_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/move_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.special/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.special/member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.special/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.special/member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/upper_bound.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/upper_bound.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/multiset/upper_bound.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/multiset/upper_bound.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/clear.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/clear.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/clear.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/clear.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/emplace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/emplace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/emplace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/emplace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/emplace_hint.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/emplace_hint.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/emplace_hint.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/emplace_hint.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/empty.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/empty.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/empty.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/empty.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/equal_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/equal_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/equal_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/equal_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/erase_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/erase_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/erase_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/erase_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/erase_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/erase_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/erase_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/erase_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/erase_key.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/erase_key.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/erase_key.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/erase_key.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/find.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/find.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/find.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/find.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/insert_cv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/insert_cv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/insert_cv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/insert_cv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/insert_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/insert_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/insert_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/insert_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/insert_iter_cv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/insert_iter_cv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/insert_iter_cv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/insert_iter_cv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/insert_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/insert_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/insert_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/insert_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/insert_iter_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/insert_iter_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/insert_iter_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/insert_iter_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/insert_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/insert_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/insert_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/insert_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/lower_bound.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/lower_bound.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/lower_bound.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/lower_bound.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/max_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/max_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/max_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/max_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/assign_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/compare_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/compare_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/compare_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/compare_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/copy_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/copy_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/copy_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/copy_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/copy_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/copy_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/copy_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/copy_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/initializer_list_compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/initializer_list_compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/initializer_list_compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/initializer_list_compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/initializer_list_compare_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/iter_iter_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/move_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/move_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/move_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/move_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/move_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.cons/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.cons/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.special/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.special/member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.special/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.special/member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.special/non_member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.special/non_member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.special/non_member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.special/non_member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.special/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.special/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/set.special/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/set.special/swap_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/upper_bound.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/upper_bound.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/upper_bound.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/upper_bound.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/set/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/set/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/set/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/tree_balance_after_insert.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/tree_balance_after_insert.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/tree_balance_after_insert.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/tree_balance_after_insert.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/tree_left_rotate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/tree_left_rotate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/tree_left_rotate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/tree_left_rotate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/tree_remove.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/tree_remove.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/tree_remove.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/tree_remove.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/associative/tree_right_rotate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/tree_right_rotate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/associative/tree_right_rotate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/associative/tree_right_rotate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_cont_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_comp_rcont_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_copy_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons.alloc/ctor_move_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/assign_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/assign_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/assign_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/assign_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/assign_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_container.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_container.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_container.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_container.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_comp_rcontainer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_cont.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_cont.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_cont.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_cont.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_iter_iter_comp_rcont.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/ctor_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.cons/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.members/emplace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/emplace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.members/emplace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/emplace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.members/empty.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/empty.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.members/empty.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/empty.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.members/pop.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/pop.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.members/pop.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/pop.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.members/push.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/push.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.members/push.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/push.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/push_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.members/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.members/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.members/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.members/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.members/top.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/top.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.members/top.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.members/top.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.special/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.special/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.special/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.special/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/priqueue.special/swap_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/priority.queue/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/priority.queue/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_container_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_queue_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rcontainer_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons.alloc/ctor_rqueue_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/ctor_container.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_container.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/ctor_container.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_container.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/ctor_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/ctor_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/ctor_default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/ctor_default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/ctor_rcontainer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.cons/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/assign_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/assign_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/assign_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/assign_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/assign_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/back.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/back.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/back.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/back.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/back_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/back_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/back_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/back_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/emplace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/emplace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/emplace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/emplace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/empty.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/empty.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/empty.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/empty.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/front.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/front.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/front.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/front.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/front_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/front_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/front_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/front_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/pop.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/pop.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/pop.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/pop.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/push.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/push.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/push.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/push.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/push_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.defn/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.defn/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.ops/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.ops/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.ops/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.ops/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.ops/lt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.ops/lt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.ops/lt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.ops/lt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.special/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.special/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.special/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.special/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/queue.special/swap_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/queue/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/queue/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_container_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_copy_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rcontainer_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons.alloc/ctor_rqueue_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/ctor_container.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_container.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/ctor_container.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_container.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/ctor_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/ctor_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/ctor_default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/ctor_default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/ctor_rcontainer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.cons/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/assign_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/assign_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/assign_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/assign_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/assign_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/emplace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/emplace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/emplace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/emplace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/empty.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/empty.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/empty.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/empty.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/pop.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/pop.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/pop.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/pop.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/push.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/push.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/push.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/push.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/push_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/top.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/top.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/top.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/top.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/top_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/top_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/top_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/top_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.defn/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.defn/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.ops/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.ops/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.ops/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.ops/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.ops/lt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.ops/lt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.ops/lt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.ops/lt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.special/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.special/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.special/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.special/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/stack.special/swap_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.adaptors/stack/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.adaptors/stack/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.requirements/associative.reqmts/associative.reqmts.except/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.requirements/associative.reqmts/associative.reqmts.except/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.requirements/associative.reqmts/associative.reqmts.except/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.requirements/associative.reqmts/associative.reqmts.except/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.requirements/associative.reqmts/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.requirements/associative.reqmts/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.requirements/associative.reqmts/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.requirements/associative.reqmts/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.requirements/container.requirements.dataraces/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.requirements/container.requirements.dataraces/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.requirements/container.requirements.dataraces/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.requirements/container.requirements.dataraces/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.requirements/container.requirements.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.requirements/container.requirements.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.requirements/container.requirements.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.requirements/container.requirements.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.requirements/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.requirements/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.requirements/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.requirements/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.requirements/sequence.reqmts/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.requirements/sequence.reqmts/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.requirements/sequence.reqmts/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.requirements/sequence.reqmts/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.requirements/unord.req/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.requirements/unord.req/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.requirements/unord.req/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.requirements/unord.req/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/container.requirements/unord.req/unord.req.except/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.requirements/unord.req/unord.req.except/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/container.requirements/unord.req/unord.req.except/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/container.requirements/unord.req/unord.req.except/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/containers.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/containers.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/containers.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/containers.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.cons/initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.cons/initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.cons/initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.cons/initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.data/data.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.data/data.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.data/data.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.data/data.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.data/data_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.data/data_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.data/data_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.data/data_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.fill/fill.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.fill/fill.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.fill/fill.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.fill/fill.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.size/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.size/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.size/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.size/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.special/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.special/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.special/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.special/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.swap/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.swap/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.swap/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.swap/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.tuple/get.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.tuple/get.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.tuple/get.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.tuple/get.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.tuple/get.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.tuple/get.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.tuple/get.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.tuple/get.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.tuple/get_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.tuple/get_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.tuple/get_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.tuple/get_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.tuple/get_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.tuple/get_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.tuple/get_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.tuple/get_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.tuple/tuple_element.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.tuple/tuple_element.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.tuple/tuple_element.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.tuple/tuple_element.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.tuple/tuple_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.tuple/tuple_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.tuple/tuple_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.tuple/tuple_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.zero/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.zero/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/array.zero/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/array.zero/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/begin.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/begin.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/begin.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/begin.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/array/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/array/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/array/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.capacity/access.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.capacity/access.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.capacity/access.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.capacity/access.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.capacity/resize_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.capacity/resize_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.capacity/resize_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.capacity/resize_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.capacity/shrink_to_fit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.capacity/shrink_to_fit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.capacity/shrink_to_fit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.capacity/shrink_to_fit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/assign_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/assign_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/assign_size_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/copy_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/initializer_list_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/iter_iter_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/move_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/move_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/op_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/op_equal_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/size_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/size_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/size_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/size_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.cons/size_value_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/emplace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/emplace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/emplace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/emplace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_back.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/emplace_front.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/push_back.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/push_back.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/push_back.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/push_back.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/push_back_exception_safety.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/push_back_exception_safety.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/push_back_exception_safety.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/push_back_exception_safety.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/push_back_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/push_front.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/push_front.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/push_front.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/push_front.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/push_front_exception_safety.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/push_front_exception_safety.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/push_front_exception_safety.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/push_front_exception_safety.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.special/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.special/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.special/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.special/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.special/copy_backward.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.special/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.special/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.special/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.special/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.special/move_backward.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.special/move_backward.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.special/move_backward.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.special/move_backward.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.special/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.special/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.special/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.special/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/deque.special/swap_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/iterators.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/iterators.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/iterators.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/iterators.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/deque/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/deque/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.access/front.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_op_init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/assign_size_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/size.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/size.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.cons/size_value_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/before_begin.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.iter/iterators.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/clear.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_after.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/emplace_front.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/erase_after_one.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/insert_after_size_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/pop_front.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_exception_safety.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_exception_safety.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_exception_safety.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_exception_safety.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/push_front_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.modifiers/resize_size_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/merge_pred.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/reverse.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/sort_pred.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_flist.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_one.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_one.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_one.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_one.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/splice_after_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.ops/unique_pred.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.spec/equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.spec/equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/non_member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.spec/relational.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/relational.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.spec/relational.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/relational.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/forwardlist.spec/swap_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/max_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/max_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/max_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/max_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/forwardlist/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/forwardlist/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_back.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_back.pass.cpp
new file mode 100644
index 0000000..ef8e692
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_back.pass.cpp
@@ -0,0 +1,41 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <list>
+
+// Call back() on empty container.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <list>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::list<T> C;
+    C c(1);
+    assert(c.back() == 0);
+    c.clear();
+    assert(c.back() == 0);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_cback.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_cback.pass.cpp
new file mode 100644
index 0000000..dc40b47
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_cback.pass.cpp
@@ -0,0 +1,39 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <list>
+
+// Call back() on empty const container.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <list>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::list<T> C;
+    const C c;
+    assert(c.back() == 0);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_cfront.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_cfront.pass.cpp
new file mode 100644
index 0000000..aa5ab98
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_cfront.pass.cpp
@@ -0,0 +1,39 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <list>
+
+// Call front() on empty const container.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <list>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::list<T> C;
+    const C c;
+    assert(c.front() == 0);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_front.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_front.pass.cpp
new file mode 100644
index 0000000..fc37c5a
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_front.pass.cpp
@@ -0,0 +1,41 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <list>
+
+// Call front() on empty container.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <list>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::list<T> C;
+    C c(1);
+    assert(c.front() == 0);
+    c.clear();
+    assert(c.front() == 0);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_iterators_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_iterators_1.pass.cpp
new file mode 100644
index 0000000..7038ed4
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_iterators_1.pass.cpp
@@ -0,0 +1,40 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <list>
+
+// Compare iterators from different containers with == or !=.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <list>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::list<T> C;
+    C c1;
+    C c2;
+    bool b = c1.begin() != c2.begin();
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_iterators_6.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_iterators_6.pass.cpp
new file mode 100644
index 0000000..c64b438
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_iterators_6.pass.cpp
@@ -0,0 +1,42 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <list>
+
+// Decrement iterator prior to begin.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <list>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::list<T> C;
+    C c(1);
+    C::iterator i = c.end();
+    --i;
+    assert(i == c.begin());
+    --i;
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_iterators_7.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_iterators_7.pass.cpp
new file mode 100644
index 0000000..0d61b23
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_iterators_7.pass.cpp
@@ -0,0 +1,42 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <list>
+
+// Increment iterator past end.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <list>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::list<T> C;
+    C c(1);
+    C::iterator i = c.begin();
+    ++i;
+    assert(i == c.end());
+    ++i;
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_iterators_8.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_iterators_8.pass.cpp
new file mode 100644
index 0000000..b05c3ab
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/db_iterators_8.pass.cpp
@@ -0,0 +1,40 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <list>
+
+// Dereference non-dereferenceable iterator.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <list>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::list<T> C;
+    C c(1);
+    C::iterator i = c.end();
+    T j = *i;
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/iterators.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/iterators.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/iterators.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/iterators.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.capacity/resize_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.capacity/resize_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.capacity/resize_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.capacity/resize_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.capacity/resize_size_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/assign_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/assign_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/assign_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/assign_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/assign_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/assign_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/assign_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/assign_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/assign_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/copy_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/default_stack_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/initializer_list_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/input_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/input_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/input_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/input_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/move_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/move_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/op_equal_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/size_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/size_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/size_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/size_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.cons/size_value_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/clear.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/clear.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/clear.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/clear.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/emplace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/emplace.pass.cpp
similarity index 80%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/emplace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/emplace.pass.cpp
index 703b034..218c42b 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/emplace.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/emplace.pass.cpp
@@ -11,6 +11,10 @@
 
 // template <class... Args> void emplace(const_iterator p, Args&&... args);
 
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
 #include <list>
 #include <cassert>
 
@@ -44,4 +48,12 @@
     assert(c.back().geti() == 3);
     assert(c.back().getd() == 4.5);
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
+#if _LIBCPP_DEBUG2 >= 1
+    {
+        std::list<A> c1;
+        std::list<A> c2;
+        std::list<A>::iterator i = c1.emplace(c2.cbegin(), 2, 3.5);
+        assert(false);
+    }
+#endif
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/emplace_back.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/emplace_back.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/emplace_back.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/emplace_back.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/emplace_front.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/emplace_front.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/emplace_front.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/emplace_front.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/erase_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/erase_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp
new file mode 100644
index 0000000..68ba20d
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp
@@ -0,0 +1,38 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <list>
+
+// Call erase(const_iterator position) with end()
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <list>
+#include <cassert>
+#include <cstdlib>
+#include <exception>
+
+int main()
+{
+    int a1[] = {1, 2, 3};
+    std::list<int> l1(a1, a1+3);
+    std::list<int>::const_iterator i = l1.end();
+    l1.erase(i);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp
new file mode 100644
index 0000000..8026878
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp
@@ -0,0 +1,39 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <list>
+
+// Call erase(const_iterator position) with iterator from another container
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <list>
+#include <cassert>
+#include <cstdlib>
+#include <exception>
+
+int main()
+{
+    int a1[] = {1, 2, 3};
+    std::list<int> l1(a1, a1+3);
+    std::list<int> l2(a1, a1+3);
+    std::list<int>::const_iterator i = l2.begin();
+    l1.erase(i);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp
new file mode 100644
index 0000000..d9d901d
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp
@@ -0,0 +1,38 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <list>
+
+// Call erase(const_iterator first, const_iterator last); with first iterator from another container
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <list>
+#include <cassert>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    int a1[] = {1, 2, 3};
+    std::list<int> l1(a1, a1+3);
+    std::list<int> l2(a1, a1+3);
+    std::list<int>::iterator i = l1.erase(l2.cbegin(), next(l1.cbegin()));
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp
new file mode 100644
index 0000000..dc9a0fe
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp
@@ -0,0 +1,38 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <list>
+
+// Call erase(const_iterator first, const_iterator last); with second iterator from another container
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <list>
+#include <cassert>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    int a1[] = {1, 2, 3};
+    std::list<int> l1(a1, a1+3);
+    std::list<int> l2(a1, a1+3);
+    std::list<int>::iterator i = l1.erase(l1.cbegin(), next(l2.cbegin()));
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp
new file mode 100644
index 0000000..acfc90e
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp
@@ -0,0 +1,38 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <list>
+
+// Call erase(const_iterator first, const_iterator last); with both iterators from another container
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <list>
+#include <cassert>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    int a1[] = {1, 2, 3};
+    std::list<int> l1(a1, a1+3);
+    std::list<int> l2(a1, a1+3);
+    std::list<int>::iterator i = l1.erase(l2.cbegin(), next(l2.cbegin()));
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp
new file mode 100644
index 0000000..bf69657
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp
@@ -0,0 +1,37 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <list>
+
+// Call erase(const_iterator first, const_iterator last); with a bad range
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <list>
+#include <cassert>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    int a1[] = {1, 2, 3};
+    std::list<int> l1(a1, a1+3);
+    std::list<int>::iterator i = l1.erase(next(l1.cbegin()), l1.cbegin());
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
similarity index 78%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
index 37f3e85..e8ea2a8 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp
@@ -12,9 +12,14 @@
 // template <InputIterator Iter>
 //   iterator insert(const_iterator position, Iter first, Iter last);
 
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
 #include <list>
 #include <cstdlib>
 #include <cassert>
+#include "test_iterators.h"
 
 int throw_next = 0xFFFF;
 int count = 0;
@@ -36,6 +41,7 @@
 
 int main()
 {
+    {
     int a1[] = {1, 2, 3};
     std::list<int> l1;
     std::list<int>::iterator i = l1.insert(l1.begin(), a1, a1+3);
@@ -90,4 +96,17 @@
     assert(*i == 6);
     ++i;
     assert(*i == 3);
+    }
+#if _LIBCPP_DEBUG2 >= 1
+    {
+        throw_next = 0xFFFF;
+        std::list<int> v(100);
+        std::list<int> v2(100);
+        int a[] = {1, 2, 3, 4, 5};
+        const int N = sizeof(a)/sizeof(a[0]);
+        std::list<int>::iterator i = v.insert(next(v2.cbegin(), 10), input_iterator<const int*>(a),
+                                       input_iterator<const int*>(a+N));
+        assert(false);
+    }
+#endif
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
similarity index 77%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
index d5ca6e5..3c35224 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_rvalue.pass.cpp
@@ -11,6 +11,10 @@
 
 // iterator insert(const_iterator position, value_type&& x);
 
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
 #include <list>
 #include <cassert>
 
@@ -28,4 +32,12 @@
     assert(l1.front() == MoveOnly(2));
     assert(l1.back() == MoveOnly(1));
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
+#if _LIBCPP_DEBUG2 >= 1
+    {
+        std::list<int> v1(3);
+        std::list<int> v2(3);
+        v1.insert(v2.begin(), 4);
+        assert(false);
+    }
+#endif
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
similarity index 81%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
index acb9e14..9221a7f 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp
@@ -11,6 +11,10 @@
 
 // iterator insert(const_iterator position, size_type n, const value_type& x);
 
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
 #include <list>
 #include <cstdlib>
 #include <cassert>
@@ -54,4 +58,12 @@
     throw_next = 0xFFFF;
     assert(save_count == count);
     assert(l1 == std::list<int>(a2, a2+8));
+#if _LIBCPP_DEBUG2 >= 1
+    {
+        std::list<int> c1(100);
+        std::list<int> c2;
+        std::list<int>::iterator i = c1.insert(next(c2.cbegin(), 10), 5, 1);
+        assert(false);
+    }
+#endif
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
similarity index 83%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
index fb09d77..6ea2a17 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp
@@ -11,6 +11,10 @@
 
 // iterator insert(const_iterator position, const value_type& x);
 
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
 #include <list>
 #include <cstdlib>
 #include <cassert>
@@ -56,4 +60,13 @@
     throw_next = 0xFFFF;
     assert(save_count == count);
     assert(l1 == std::list<int>(a2, a2+4));
+#if _LIBCPP_DEBUG2 >= 1
+    {
+        std::list<int> v1(3);
+        std::list<int> v2(3);
+        int i = 4;
+        v1.insert(v2.begin(), i);
+        assert(false);
+    }
+#endif
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp
similarity index 78%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp
index cb25c3c..97105fd 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/pop_back.pass.cpp
@@ -11,6 +11,10 @@
 
 // void pop_back();
 
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
 #include <list>
 #include <cassert>
 
@@ -24,4 +28,8 @@
     assert(c == std::list<int>(a, a+1));
     c.pop_back();
     assert(c.empty());
+#if _LIBCPP_DEBUG2 >= 1
+        c.pop_back();
+        assert(false);
+#endif        
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/pop_front.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/pop_front.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/pop_front.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/pop_front.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/push_back.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/push_back.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/push_back.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/push_back.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/push_back_exception_safety.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/push_back_exception_safety.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/push_back_exception_safety.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/push_back_exception_safety.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/push_front.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/push_front.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/push_front.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/push_front.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/push_front_exception_safety.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/push_front_exception_safety.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/push_front_exception_safety.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/push_front_exception_safety.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.modifiers/push_front_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/merge.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/merge.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/merge.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/merge.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/merge_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/merge_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/merge_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/merge_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/remove.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/remove.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/remove.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/remove.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/remove_if.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/remove_if.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/remove_if.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/remove_if.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/reverse.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/reverse.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/reverse.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/reverse.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/sort.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/sort.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/sort.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/sort.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/sort_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/sort_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/sort_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/sort_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp
index 54dc661..26d1912 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/splice_pos_list.pass.cpp
@@ -11,6 +11,10 @@
 
 // void splice(const_iterator position, list& x);
 
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
 #include <list>
 #include <cassert>
 
@@ -397,4 +401,12 @@
         ++i;
         assert(*i == 6);
     }
+#if _LIBCPP_DEBUG2 >= 1
+    {
+        std::list<int> v1(3);
+        std::list<int> v2(3);
+        v1.splice(v2.begin(), v2);
+        assert(false);
+    }
+#endif
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp
index 4e8ca46..64402ce 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter.pass.cpp
@@ -11,6 +11,10 @@
 
 // void splice(const_iterator position, list<T,Allocator>& x, iterator i);
 
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
 #include <list>
 #include <cassert>
 
@@ -174,4 +178,12 @@
         ++i;
         assert(*i == 2);
     }
+#if _LIBCPP_DEBUG2 >= 1
+    {
+        std::list<int> v1(3);
+        std::list<int> v2(3);
+        v1.splice(v1.begin(), v2, v1.begin());
+        assert(false);
+    }
+#endif
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp
similarity index 92%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp
index 685b392..2dabf83 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/splice_pos_list_iter_iter.pass.cpp
@@ -11,6 +11,10 @@
 
 // void splice(const_iterator position, list& x, iterator first, iterator last);
 
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
 #include <list>
 #include <cassert>
 
@@ -114,4 +118,12 @@
         i = l2.begin();
         assert(*i == 4);
     }
+#if _LIBCPP_DEBUG2 >= 1
+    {
+        std::list<int> v1(3);
+        std::list<int> v2(3);
+        v1.splice(v1.begin(), v2, v2.begin(), v1.end());
+        assert(false);
+    }
+#endif
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/unique.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/unique.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/unique.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/unique.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/unique_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/unique_pred.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.ops/unique_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.ops/unique_pred.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.special/db_swap_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.special/db_swap_1.pass.cpp
new file mode 100644
index 0000000..12730c2
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.special/db_swap_1.pass.cpp
@@ -0,0 +1,42 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <list>
+
+// template <class T, class Alloc>
+//   void swap(list<T,Alloc>& x, list<T,Alloc>& y);
+
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
+#include <list>
+#include <cassert>
+
+#include <__debug>
+
+int main()
+{
+#if _LIBCPP_DEBUG2 >= 1
+    {
+        int a1[] = {1, 3, 7, 9, 10};
+        int a2[] = {0, 2, 4, 5, 6, 8, 11};
+        std::list<int> c1(a1, a1+sizeof(a1)/sizeof(a1[0]));
+        std::list<int> c2(a2, a2+sizeof(a2)/sizeof(a2[0]));
+        std::list<int>::iterator i1 = c1.begin();
+        std::list<int>::iterator i2 = c2.begin();
+        swap(c1, c2);
+        c1.erase(i2);
+        c2.erase(i1);
+        std::list<int>::iterator j = i1;
+        c1.erase(i1);
+        assert(false);
+    }
+#endif
+}
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.special/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.special/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.special/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.special/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/list.special/swap_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/list/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/list/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/list/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/assign_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/assign_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/assign_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/assign_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/assign_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/assign_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/assign_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/assign_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/assign_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/assign_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/assign_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/assign_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/capacity.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/capacity.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/capacity.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/capacity.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/construct_default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/construct_default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/construct_default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/construct_default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/construct_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/construct_iter_iter_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/construct_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/construct_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/construct_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/construct_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/construct_size_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/construct_size_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/construct_size_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/construct_size_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/construct_size_value_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/construct_size_value_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/construct_size_value_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/construct_size_value_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/copy_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/copy_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/copy_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/copy_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/erase_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/erase_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/erase_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/erase_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/erase_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/erase_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/erase_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/erase_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/initializer_list_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/insert_iter_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/insert_iter_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/insert_iter_size_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/insert_iter_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/insert_iter_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/insert_iter_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/insert_iter_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/iterators.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/iterators.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/iterators.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/iterators.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/move_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/move_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/move_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/move_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/op_equal_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/push_back.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/push_back.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/push_back.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/push_back.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/reserve.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/reserve.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/reserve.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/reserve.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/resize_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/resize_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/resize_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/resize_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/resize_size_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/resize_size_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/resize_size_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/resize_size_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/shrink_to_fit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/shrink_to_fit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/shrink_to_fit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/shrink_to_fit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp
similarity index 85%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp
index 642641e..5d0f0af 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/swap.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/swap.pass.cpp
@@ -51,4 +51,14 @@
         assert(v1.get_allocator() == A(2));
         assert(v2.get_allocator() == A(1));
     }
+    {
+        std::vector<bool> v(2);
+        std::vector<bool>::reference r1 = v[0];
+        std::vector<bool>::reference r2 = v[1];
+        r1 = true;
+        using std::swap;
+        swap(r1, r2);
+        assert(v[0] == false);
+        assert(v[1] == true);
+    }
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/swap_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/vector_bool.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/vector_bool.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector.bool/vector_bool.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector.bool/vector_bool.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_back.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_back.pass.cpp
new file mode 100644
index 0000000..b28af8b
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_back.pass.cpp
@@ -0,0 +1,41 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Call back() on empty container.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::vector<T> C;
+    C c(1);
+    assert(c.back() == 0);
+    c.clear();
+    assert(c.back() == 0);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_cback.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_cback.pass.cpp
new file mode 100644
index 0000000..18f0630
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_cback.pass.cpp
@@ -0,0 +1,39 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Call back() on empty const container.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::vector<T> C;
+    const C c;
+    assert(c.back() == 0);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp
new file mode 100644
index 0000000..9712a39
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_cfront.pass.cpp
@@ -0,0 +1,39 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Call front() on empty const container.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::vector<T> C;
+    const C c;
+    assert(c.front() == 0);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp
new file mode 100644
index 0000000..ad33043
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_cindex.pass.cpp
@@ -0,0 +1,40 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Index const vector out of bounds.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::vector<T> C;
+    const C c(1);
+    assert(c[0] == 0);
+    assert(c[1] == 0);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_front.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_front.pass.cpp
new file mode 100644
index 0000000..4892e28
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_front.pass.cpp
@@ -0,0 +1,41 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Call front() on empty container.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::vector<T> C;
+    C c(1);
+    assert(c.front() == 0);
+    c.clear();
+    assert(c.front() == 0);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_index.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_index.pass.cpp
new file mode 100644
index 0000000..05b0bc4
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_index.pass.cpp
@@ -0,0 +1,41 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Index vector out of bounds.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::vector<T> C;
+    C c(1);
+    assert(c[0] == 0);
+    c.clear();
+    assert(c[0] == 0);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_1.pass.cpp
new file mode 100644
index 0000000..fbcb40f
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_1.pass.cpp
@@ -0,0 +1,40 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Compare iterators from different containers with == or !=.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::vector<T> C;
+    C c1;
+    C c2;
+    bool b = c1.begin() != c2.begin();
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp
new file mode 100644
index 0000000..616ee5b
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_2.pass.cpp
@@ -0,0 +1,40 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Compare iterators from different containers with <.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::vector<T> C;
+    C c1;
+    C c2;
+    bool b = c1.begin() < c2.begin();
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp
new file mode 100644
index 0000000..1ef27cf
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_3.pass.cpp
@@ -0,0 +1,40 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Subtract iterators from different containers.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::vector<T> C;
+    C c1;
+    C c2;
+    int i = c1.begin() - c2.begin();
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp
new file mode 100644
index 0000000..4d60bd9
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_4.pass.cpp
@@ -0,0 +1,41 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Index iterator out of bounds.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::vector<T> C;
+    C c(1);
+    C::iterator i = c.begin();
+    assert(i[0] == 0);
+    assert(i[1] == 0);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp
new file mode 100644
index 0000000..bb3bf05
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_5.pass.cpp
@@ -0,0 +1,43 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Add to iterator out of bounds.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::vector<T> C;
+    C c(1);
+    C::iterator i = c.begin();
+    i += 1;
+    assert(i == c.end());
+    i = c.begin();
+    i += 2;
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp
new file mode 100644
index 0000000..24db88d
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_6.pass.cpp
@@ -0,0 +1,42 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Decrement iterator prior to begin.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::vector<T> C;
+    C c(1);
+    C::iterator i = c.end();
+    --i;
+    assert(i == c.begin());
+    --i;
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp
new file mode 100644
index 0000000..709af3a
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_7.pass.cpp
@@ -0,0 +1,42 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Increment iterator past end.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::vector<T> C;
+    C c(1);
+    C::iterator i = c.begin();
+    ++i;
+    assert(i == c.end());
+    ++i;
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp
new file mode 100644
index 0000000..178240a
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/db_iterators_8.pass.cpp
@@ -0,0 +1,40 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Dereference non-dereferenceable iterator.
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <iterator>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    typedef int T;
+    typedef std::vector<T> C;
+    C c(1);
+    C::iterator i = c.end();
+    T j = *i;
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/iterators.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/iterators.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/iterators.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/iterators.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.capacity/capacity.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.capacity/capacity.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.capacity/capacity.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.capacity/capacity.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.capacity/reserve.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.capacity/reserve.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.capacity/reserve.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.capacity/reserve.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.capacity/resize_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.capacity/resize_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.capacity/resize_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.capacity/resize_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.capacity/resize_size_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp
index c98d531..896026d 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.capacity/shrink_to_fit.pass.cpp
@@ -31,6 +31,7 @@
         assert(v.capacity() == 101);
         assert(v.size() == 101);
     }
+#ifndef _LIBCPP_NO_EXCEPTIONS
     {
         std::vector<int, stack_allocator<int, 400> > v(100);
         v.push_back(1);
@@ -38,4 +39,5 @@
         assert(v.capacity() == 200);
         assert(v.size() == 101);
     }
+#endif
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.capacity/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.capacity/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.capacity/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.capacity/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/assign_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/assign_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/construct_default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/construct_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/construct_size_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/construct_size_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/construct_size_value_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/construct_size_value_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/construct_size_value_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/initializer_list_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp
similarity index 84%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp
index 8d85fd9..b036405 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/move.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/move.pass.cpp
@@ -45,5 +45,13 @@
         assert(l.empty());
         assert(l2.get_allocator() == lo.get_allocator());
     }
+    {
+        int a1[] = {1, 3, 7, 9, 10};
+        std::vector<int> c1(a1, a1+sizeof(a1)/sizeof(a1[0]));
+        std::vector<int>::const_iterator i = c1.begin();
+        std::vector<int> c2 = std::move(c1);
+        std::vector<int>::iterator j = c2.erase(i);
+        assert(*j == 3);
+    }
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/move_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.cons/op_equal_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.data/data.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.data/data.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.data/data.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.data/data.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.data/data_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.data/data_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.data/data_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.data/data_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
similarity index 90%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
index 60aaa3f..d85b8f2 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/emplace.pass.cpp
@@ -11,6 +11,10 @@
 
 // template <class... Args> iterator emplace(const_iterator pos, Args&&... args);
 
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
 #include <vector>
 #include <cassert>
 #include "../../../stack_allocator.h"
@@ -102,5 +106,13 @@
         assert(c.back().geti() == 3);
         assert(c.back().getd() == 4.5);
     }
+#if _LIBCPP_DEBUG2 >= 1
+    {
+        std::vector<A> c1;
+        std::vector<A> c2;
+        std::vector<A>::iterator i = c1.emplace(c2.cbegin(), 2, 3.5);
+        assert(false);
+    }
+#endif
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/emplace_extra.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp
new file mode 100644
index 0000000..81f1354
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp
@@ -0,0 +1,38 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Call erase(const_iterator position) with end()
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <cstdlib>
+#include <exception>
+
+int main()
+{
+    int a1[] = {1, 2, 3};
+    std::vector<int> l1(a1, a1+3);
+    std::vector<int>::const_iterator i = l1.end();
+    l1.erase(i);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp
new file mode 100644
index 0000000..15fa5a3
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp
@@ -0,0 +1,39 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Call erase(const_iterator position) with iterator from another container
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <cstdlib>
+#include <exception>
+
+int main()
+{
+    int a1[] = {1, 2, 3};
+    std::vector<int> l1(a1, a1+3);
+    std::vector<int> l2(a1, a1+3);
+    std::vector<int>::const_iterator i = l2.begin();
+    l1.erase(i);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp
similarity index 86%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp
index 1185412..5fdcb87 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter.pass.cpp
@@ -47,4 +47,11 @@
         assert(distance(l1.cbegin(), l1.cend()) == 0);
         assert(i == l1.begin());
     }
+    {
+        std::vector<std::vector<int> > outer(2, std::vector<int>(1));
+        outer.erase(outer.begin(), outer.begin());
+        assert(outer.size() == 2);
+        assert(outer[0].size() == 1);
+        assert(outer[1].size() == 1);
+    }
 }
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp
new file mode 100644
index 0000000..846e111
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp
@@ -0,0 +1,38 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Call erase(const_iterator first, const_iterator last); with first iterator from another container
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    int a1[] = {1, 2, 3};
+    std::vector<int> l1(a1, a1+3);
+    std::vector<int> l2(a1, a1+3);
+    std::vector<int>::iterator i = l1.erase(l2.cbegin(), l1.cbegin()+1);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp
new file mode 100644
index 0000000..04cb5dc
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp
@@ -0,0 +1,38 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Call erase(const_iterator first, const_iterator last); with second iterator from another container
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    int a1[] = {1, 2, 3};
+    std::vector<int> l1(a1, a1+3);
+    std::vector<int> l2(a1, a1+3);
+    std::vector<int>::iterator i = l1.erase(l1.cbegin(), l2.cbegin()+1);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp
new file mode 100644
index 0000000..a614a11
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp
@@ -0,0 +1,38 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Call erase(const_iterator first, const_iterator last); with both iterators from another container
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    int a1[] = {1, 2, 3};
+    std::vector<int> l1(a1, a1+3);
+    std::vector<int> l2(a1, a1+3);
+    std::vector<int>::iterator i = l1.erase(l2.cbegin(), l2.cbegin()+1);
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp
new file mode 100644
index 0000000..9818024
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp
@@ -0,0 +1,37 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// Call erase(const_iterator first, const_iterator last); with a bad range
+
+#if _LIBCPP_DEBUG2 >= 1
+
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+
+#include <vector>
+#include <cassert>
+#include <exception>
+#include <cstdlib>
+
+int main()
+{
+    int a1[] = {1, 2, 3};
+    std::vector<int> l1(a1, a1+3);
+    std::vector<int>::iterator i = l1.erase(l1.cbegin()+1, l1.cbegin());
+    assert(false);
+}
+
+#else
+
+int main()
+{
+}
+
+#endif
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
similarity index 86%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
index 84998b2..9f68aef 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
@@ -12,6 +12,10 @@
 // template <class Iter>
 //   iterator insert(const_iterator position, Iter first, Iter last);
 
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
 #include <vector>
 #include <cassert>
 #include "../../../stack_allocator.h"
@@ -83,4 +87,15 @@
         for (; j < 105; ++j)
             assert(v[j] == 0);
     }
+#if _LIBCPP_DEBUG2 >= 1
+    {
+        std::vector<int> v(100);
+        std::vector<int> v2(100);
+        int a[] = {1, 2, 3, 4, 5};
+        const int N = sizeof(a)/sizeof(a[0]);
+        std::vector<int>::iterator i = v.insert(v2.cbegin() + 10, input_iterator<const int*>(a),
+                                        input_iterator<const int*>(a+N));
+        assert(false);
+    }
+#endif
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
similarity index 85%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
index aeef615..e34dc36 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_rvalue.pass.cpp
@@ -11,6 +11,10 @@
 
 // iterator insert(const_iterator position, value_type&& x);
 
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
 #include <vector>
 #include <cassert>
 #include "../../../stack_allocator.h"
@@ -43,5 +47,13 @@
         for (++j; j < 101; ++j)
             assert(v[j] == MoveOnly());
     }
+#if _LIBCPP_DEBUG2 >= 1
+    {
+        std::vector<int> v1(3);
+        std::vector<int> v2(3);
+        v1.insert(v2.begin(), 4);
+        assert(false);
+    }
+#endif
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp
similarity index 82%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp
index b355d20..ed94057 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_size_value.pass.cpp
@@ -11,6 +11,10 @@
 
 // iterator insert(const_iterator position, size_type n, const value_type& x);
 
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
 #include <vector>
 #include <cassert>
 #include "../../../stack_allocator.h"
@@ -43,4 +47,12 @@
         for (++j; j < 105; ++j)
             assert(v[j] == 0);
     }
+#if _LIBCPP_DEBUG2 >= 1
+    {
+        std::vector<int> c1(100);
+        std::vector<int> c2;
+        std::vector<int>::iterator i = c1.insert(c2.cbegin() + 10, 5, 1);
+        assert(false);
+    }
+#endif
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp
similarity index 82%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp
index 20ec42d..5bc87fd 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/insert_iter_value.pass.cpp
@@ -11,6 +11,10 @@
 
 // iterator insert(const_iterator position, const value_type& x);
 
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
 #include <vector>
 #include <cassert>
 #include "../../../stack_allocator.h"
@@ -41,4 +45,13 @@
         for (++j; j < 101; ++j)
             assert(v[j] == 0);
     }
+#if _LIBCPP_DEBUG2 >= 1
+    {
+        std::vector<int> v1(3);
+        std::vector<int> v2(3);
+        int i = 4;
+        v1.insert(v2.begin(), i);
+        assert(false);
+    }
+#endif
 }
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp
new file mode 100644
index 0000000..abfefb0
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp
@@ -0,0 +1,41 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// void pop_back();
+
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
+#include <vector>
+#include <cassert>
+#include "../../../stack_allocator.h"
+
+#if _LIBCPP_DEBUG2 >= 1
+#include <cstdlib>
+#include <exception>
+
+#endif
+
+int main()
+{
+    {
+        std::vector<int> c;
+        c.push_back(1);
+        assert(c.size() == 1);
+        c.pop_back();
+        assert(c.size() == 0);
+#if _LIBCPP_DEBUG2 >= 1
+        c.pop_back();
+        assert(false);
+#endif        
+    }
+}
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/push_back.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/push_back.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/push_back.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/push_back.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/push_back_exception_safety.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/push_back_exception_safety.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/push_back_exception_safety.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/push_back_exception_safety.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp
new file mode 100644
index 0000000..e0ae808
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.special/db_swap_1.pass.cpp
@@ -0,0 +1,39 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <vector>
+
+// template <class T, class Alloc>
+//   void swap(vector<T,Alloc>& x, vector<T,Alloc>& y);
+
+#if _LIBCPP_DEBUG2 >= 1
+#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
+#endif
+
+#include <vector>
+#include <cassert>
+
+int main()
+{
+#if _LIBCPP_DEBUG2 >= 1
+    {
+        int a1[] = {1, 3, 7, 9, 10};
+        int a2[] = {0, 2, 4, 5, 6, 8, 11};
+        std::vector<int> c1(a1, a1+sizeof(a1)/sizeof(a1[0]));
+        std::vector<int> c2(a2, a2+sizeof(a2)/sizeof(a2[0]));
+        std::vector<int>::iterator i1 = c1.begin();
+        std::vector<int>::iterator i2 = c2.begin();
+        swap(c1, c2);
+        c1.erase(i2);
+        c2.erase(i1);
+        c1.erase(i1);
+        assert(false);
+    }
+#endif
+}
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.special/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.special/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.special/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.special/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/vector.special/swap_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/sequences/vector/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/sequences/vector/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/stack_allocator.h b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/stack_allocator.h
similarity index 89%
rename from sources/cxx-stl/llvm-libc++/test/containers/stack_allocator.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/stack_allocator.h
index 30f5871..e6af473 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/stack_allocator.h
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/stack_allocator.h
@@ -29,8 +29,13 @@
 public:
     pointer allocate(size_type n, const void* = 0)
     {
-        if (n > N - (ptr_ - buf_) / sizeof(value_type))
+        if (n > N - (ptr_ - buf_) / sizeof(value_type)) {
+#ifndef _LIBCPP_NO_EXCEPTIONS
             throw std::bad_alloc();
+#else
+            std::terminate();
+#endif
+        }
         pointer r = (T*)ptr_;
         ptr_ += n * sizeof(T);
         return r;
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/test_allocator.h b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/test_allocator.h
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/containers/test_allocator.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/test_allocator.h
index c5da7e6..eed33a0 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/test_allocator.h
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/test_allocator.h
@@ -48,8 +48,13 @@
     const_pointer address(const_reference x) const {return &x;}
     pointer allocate(size_type n, const void* = 0)
         {
-            if (count >= throw_after)
+            if (count >= throw_after) {
+#ifndef _LIBCPP_NO_EXCEPTIONS
                 throw std::bad_alloc();
+#else
+                std::terminate();
+#endif
+            }
             ++count;
             return (pointer)std::malloc(n * sizeof(T));
         }
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/test_compare.h b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/test_compare.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/test_compare.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/test_compare.h
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/test_hash.h b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/test_hash.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/test_hash.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/test_hash.h
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/next_prime.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/next_prime.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/next_prime.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/next_prime.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/bucket.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/bucket.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/bucket.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/bucket.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/bucket_count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/bucket_count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/bucket_count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/bucket_count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/bucket_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/bucket_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/bucket_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/bucket_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/equal_range_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/equal_range_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/equal_range_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/equal_range_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/equal_range_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/equal_range_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/equal_range_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/equal_range_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/find_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/find_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/find_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/find_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/find_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/find_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/find_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/find_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/iterators.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/iterators.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/iterators.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/iterators.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/load_factor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/load_factor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/load_factor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/load_factor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/local_iterators.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/local_iterators.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/local_iterators.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/local_iterators.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/max_bucket_count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/max_bucket_count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/max_bucket_count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/max_bucket_count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/max_load_factor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/max_load_factor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/max_load_factor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/max_load_factor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/max_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/max_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/max_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/max_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/rehash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/rehash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/rehash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/rehash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/reserve.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/reserve.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/reserve.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/reserve.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/swap_member.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/swap_member.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/swap_member.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/swap_member.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/copy_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/init_size_hash_equal_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/range_size_hash_equal_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.cnstr/size_hash_equal_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.elem/at.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.elem/at.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.elem/at.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.elem/at.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.elem/index.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.elem/index.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.elem/index.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.elem/index.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unord.map.swap/swap_non_member.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/clear.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/clear.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/clear.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/clear.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/emplace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/emplace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/emplace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/emplace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/emplace_hint.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/erase_const_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_const_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/erase_const_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_const_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/erase_key.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_key.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/erase_key.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_key.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/erase_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/erase_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/erase_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/insert_const_lvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_const_lvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/insert_const_lvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_const_lvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_const_lvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_hint_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/unorder.map.modifiers/insert_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.map/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.map/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/bucket.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/bucket.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/bucket.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/bucket.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/bucket_count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/bucket_count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/bucket_count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/bucket_count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/bucket_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/bucket_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/bucket_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/bucket_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/equal_range_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/equal_range_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/equal_range_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/equal_range_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/equal_range_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/equal_range_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/equal_range_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/equal_range_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/find_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/find_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/find_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/find_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/find_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/find_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/find_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/find_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/iterators.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/iterators.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/iterators.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/iterators.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/iterators.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/iterators.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/iterators.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/iterators.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/load_factor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/load_factor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/load_factor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/load_factor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/local_iterators.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/local_iterators.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/local_iterators.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/local_iterators.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/local_iterators.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/local_iterators.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/local_iterators.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/local_iterators.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/max_bucket_count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/max_bucket_count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/max_bucket_count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/max_bucket_count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/max_load_factor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/max_load_factor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/max_load_factor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/max_load_factor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/max_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/max_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/max_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/max_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/rehash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/rehash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/rehash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/rehash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/reserve.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/reserve.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/reserve.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/reserve.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/swap_member.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/swap_member.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/swap_member.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/swap_member.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/copy_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/init_size_hash_equal_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/range_size_hash_equal_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/size_hash_equal_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/clear.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/clear.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/clear.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/clear.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_const_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_key.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_key.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_key.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_key.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/erase_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_const_lvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_const_lvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_hint_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.modifiers/insert_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multimap/unord.multimap.swap/swap_non_member.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/bucket.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/bucket.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/bucket.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/bucket.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/bucket_count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/bucket_count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/bucket_count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/bucket_count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/bucket_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/bucket_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/bucket_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/bucket_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/clear.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/clear.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/clear.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/clear.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/emplace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/emplace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/emplace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/emplace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/emplace_hint.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/emplace_hint.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/emplace_hint.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/emplace_hint.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/equal_range_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/equal_range_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/equal_range_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/equal_range_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/equal_range_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/equal_range_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/equal_range_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/equal_range_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/erase_const_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/erase_const_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/erase_const_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/erase_const_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/erase_key.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/erase_key.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/erase_key.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/erase_key.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/erase_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/erase_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/erase_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/erase_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/find_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/find_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/find_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/find_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/find_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/find_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/find_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/find_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/insert_const_lvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/insert_const_lvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/insert_const_lvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/insert_const_lvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/insert_hint_const_lvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/insert_hint_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/insert_init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/insert_init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/insert_init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/insert_init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/insert_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/insert_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/insert_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/insert_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/insert_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/insert_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/insert_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/insert_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/iterators.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/iterators.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/iterators.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/iterators.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/iterators.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/iterators.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/iterators.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/iterators.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/load_factor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/load_factor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/load_factor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/load_factor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/local_iterators.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/local_iterators.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/local_iterators.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/local_iterators.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/local_iterators.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/local_iterators.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/local_iterators.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/local_iterators.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/max_bucket_count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/max_bucket_count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/max_bucket_count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/max_bucket_count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/max_load_factor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/max_load_factor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/max_load_factor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/max_load_factor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/max_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/max_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/max_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/max_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/rehash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/rehash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/rehash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/rehash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/reserve.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/reserve.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/reserve.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/reserve.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/swap_member.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/swap_member.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/swap_member.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/swap_member.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/copy_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/init_size_hash_equal_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/range_size_hash_equal_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/size_hash_equal_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.multiset/unord.multiset.swap/swap_non_member.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/bucket.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/bucket.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/bucket.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/bucket.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/bucket_count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/bucket_count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/bucket_count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/bucket_count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/bucket_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/bucket_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/bucket_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/bucket_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/clear.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/clear.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/clear.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/clear.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/emplace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/emplace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/emplace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/emplace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/emplace_hint.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/emplace_hint.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/emplace_hint.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/emplace_hint.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/equal_range_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/equal_range_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/equal_range_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/equal_range_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/equal_range_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/equal_range_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/equal_range_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/equal_range_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/erase_const_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/erase_const_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/erase_const_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/erase_const_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/erase_key.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/erase_key.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/erase_key.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/erase_key.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/erase_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/erase_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/erase_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/erase_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/find_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/find_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/find_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/find_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/find_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/find_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/find_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/find_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/insert_const_lvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/insert_const_lvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/insert_const_lvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/insert_const_lvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/insert_hint_const_lvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/insert_hint_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/insert_init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/insert_init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/insert_init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/insert_init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/insert_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/insert_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/insert_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/insert_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/insert_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/insert_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/insert_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/insert_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/iterators.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/iterators.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/iterators.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/iterators.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/iterators.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/iterators.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/iterators.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/iterators.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/load_factor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/load_factor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/load_factor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/load_factor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/local_iterators.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/local_iterators.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/local_iterators.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/local_iterators.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/local_iterators.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/local_iterators.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/local_iterators.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/local_iterators.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/max_bucket_count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/max_bucket_count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/max_bucket_count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/max_bucket_count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/max_load_factor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/max_load_factor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/max_load_factor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/max_load_factor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/max_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/max_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/max_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/max_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/rehash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/rehash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/rehash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/rehash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/reserve.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/reserve.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/reserve.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/reserve.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/swap_member.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/swap_member.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/swap_member.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/swap_member.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/copy_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/init_size_hash_equal_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/range_size_hash_equal_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.cnstr/size_hash_equal_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/unord.set.swap/swap_non_member.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/containers/unord/unord.set/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/containers/unord/unord.set/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/A.h b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/A.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/A.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/A.h
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/AB.h b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/AB.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/AB.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/AB.h
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/assignment.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/assignment.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/assignment.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/assignment.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/assignment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/assignment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/assignment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/assignment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert_assignment.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert_assignment.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert_assignment.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert_assignment.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert_assignment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert_assignment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert_assignment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert_assignment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/copy.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/copy.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/explicit.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/explicit.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/explicit.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/explicit.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/assign_from_auto_ptr_ref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/assign_from_auto_ptr_ref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/assign_from_auto_ptr_ref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/assign_from_auto_ptr_ref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/convert_from_auto_ptr_ref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/convert_from_auto_ptr_ref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/convert_from_auto_ptr_ref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/convert_from_auto_ptr_ref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/convert_to_auto_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/convert_to_auto_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/convert_to_auto_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/convert_to_auto_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/convert_to_auto_ptr_ref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/convert_to_auto_ptr_ref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/convert_to_auto_ptr_ref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.conv/convert_to_auto_ptr_ref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/arrow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/arrow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/arrow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/arrow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/deref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/deref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/deref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/deref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/release.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/release.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/release.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/release.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/reset.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/reset.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/reset.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/auto.ptr.members/reset.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/element_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/element_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/auto.ptr/element_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/auto.ptr/element_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.auto.ptr/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.auto.ptr/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/assert_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/assert_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/assert_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/assert_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/ciso646.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/ciso646.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/ciso646.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/ciso646.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/complex.h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/complex.h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/complex.h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/complex.h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/ctype_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/ctype_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/ctype_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/ctype_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/errno_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/errno_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/errno_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/errno_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/fenv_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/fenv_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/fenv_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/fenv_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/float_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/float_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/float_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/float_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/inttypes_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/inttypes_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/inttypes_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/inttypes_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/iso646_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/iso646_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/iso646_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/iso646_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/limits_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/limits_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/limits_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/limits_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/locale_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/locale_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/locale_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/locale_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/math_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/math_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/math_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/math_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/setjmp_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/setjmp_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/setjmp_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/setjmp_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/signal_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/signal_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/signal_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/signal_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/stdarg_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/stdarg_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/stdarg_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/stdarg_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/stdbool_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/stdbool_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/stdbool_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/stdbool_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/stddef_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/stddef_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/stddef_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/stddef_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/stdint_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/stdint_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/stdint_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/stdint_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/stdio_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/stdio_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/stdio_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/stdio_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/stdlib_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/stdlib_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/stdlib_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/stdlib_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/string_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/string_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/string_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/string_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/tgmath_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/tgmath_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/tgmath_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/tgmath_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/time_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/time_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/time_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/time_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/uchar_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/uchar_h.pass.cpp
similarity index 93%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/uchar_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/uchar_h.pass.cpp
index c84c26c..14803ff 100644
--- a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/uchar_h.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/uchar_h.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: apple-darwin
 
 // <uchar.h>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/wchar_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/wchar_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/wchar_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/wchar_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/wctype_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/wctype_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.c.headers/wctype_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.c.headers/wctype_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_binary_function.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_binary_function.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_binary_function.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_binary_function.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_unary_function.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_unary_function.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_unary_function.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_unary_function.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun2.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun2.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun2.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_ref_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_ref_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_ref_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_ref_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_ref_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_ref_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_ref_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_ref_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.adaptors/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.adaptors/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.base/binary_function.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.base/binary_function.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.base/binary_function.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.base/binary_function.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.base/unary_function.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.base/unary_function.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/depr.base/unary_function.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/depr.base/unary_function.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.function.objects/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.function.objects/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.ios.members/io_state.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.ios.members/io_state.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.ios.members/io_state.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.ios.members/io_state.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.ios.members/open_mode.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.ios.members/open_mode.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.ios.members/open_mode.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.ios.members/open_mode.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.ios.members/seek_dir.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.ios.members/seek_dir.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.ios.members/seek_dir.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.ios.members/seek_dir.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.ios.members/streamoff.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.ios.members/streamoff.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.ios.members/streamoff.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.ios.members/streamoff.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.ios.members/streampos.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.ios.members/streampos.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.ios.members/streampos.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.ios.members/streampos.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.lib.binders/depr.lib.bind.1st/bind1st.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.lib.binders/depr.lib.bind.1st/bind1st.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.lib.binders/depr.lib.bind.1st/bind1st.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.lib.binders/depr.lib.bind.1st/bind1st.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.lib.binders/depr.lib.bind.2nd/bind2nd.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.lib.binders/depr.lib.bind.2nd/bind2nd.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.lib.binders/depr.lib.bind.2nd/bind2nd.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.lib.binders/depr.lib.bind.2nd/bind2nd.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.lib.binders/depr.lib.binder.1st/binder1st.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.lib.binders/depr.lib.binder.1st/binder1st.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.lib.binders/depr.lib.binder.1st/binder1st.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.lib.binders/depr.lib.binder.1st/binder1st.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.lib.binders/depr.lib.binder.2nd/binder2nd.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.lib.binders/depr.lib.binder.2nd/binder2nd.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.lib.binders/depr.lib.binder.2nd/binder2nd.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.lib.binders/depr.lib.binder.2nd/binder2nd.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.lib.binders/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.lib.binders/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.lib.binders/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.lib.binders/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.lib.binders/test_func.h b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.lib.binders/test_func.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.lib.binders/test_func.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.lib.binders/test_func.h
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/ccp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/ccp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/ccp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/ccp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/ccp_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/ccp_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/ccp_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/ccp_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/cp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/cp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/cp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/cp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/cp_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/cp_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/cp_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.cons/cp_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.members/rdbuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.members/rdbuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.members/rdbuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.members/rdbuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.members/str.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.members/str.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.members/str.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.istrstream/depr.istrstream.members/str.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.istrstream/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.istrstream/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.istrstream/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.istrstream/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/cp_size_mode.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/cp_size_mode.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/cp_size_mode.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/cp_size_mode.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/freeze.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/freeze.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/freeze.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/freeze.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/pcount.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/pcount.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/pcount.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/pcount.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/rdbuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/rdbuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/rdbuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/rdbuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/str.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/str.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/str.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.ostrstream/depr.ostrstream.members/str.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.ostrstream/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.ostrstream/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.ostrstream/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.ostrstream/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/cp_size_mode.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/cp_size_mode.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/cp_size_mode.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/cp_size_mode.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.dest/rdbuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.dest/rdbuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.dest/rdbuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.dest/rdbuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/freeze.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/freeze.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/freeze.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/freeze.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/pcount.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/pcount.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/pcount.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/pcount.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/str.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/str.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/str.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstream/depr.strstream.oper/str.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstream/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstream/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstream/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstream/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/ccp_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/ccp_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/ccp_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/ccp_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cp_size_cp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cp_size_cp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cp_size_cp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cp_size_cp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cscp_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cscp_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cscp_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cscp_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cucp_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cucp_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cucp_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cucp_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/custom_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/custom_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/custom_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/custom_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/scp_size_scp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/scp_size_scp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/scp_size_scp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/scp_size_scp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/ucp_size_ucp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/ucp_size_ucp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/ucp_size_ucp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/ucp_size_ucp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/freeze.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/freeze.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/freeze.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/freeze.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/pcount.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/pcount.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/pcount.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/pcount.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/str.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/str.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/str.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.members/str.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/overflow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/overflow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/overflow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/overflow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/pbackfail.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/pbackfail.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/pbackfail.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/pbackfail.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/seekoff.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/seekoff.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/seekoff.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/seekoff.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/seekpos.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/seekpos.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/seekpos.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/seekpos.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/setbuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/setbuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/setbuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/setbuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/underflow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/underflow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/underflow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.virtuals/underflow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/depr.strstreambuf/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/depr.strstreambuf/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/depr.str.strstreams/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/depr.str.strstreams/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/exception.unexpected/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/exception.unexpected/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/exception.unexpected/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/exception.unexpected/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/exception.unexpected/set.unexpected/get_unexpected.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/exception.unexpected/set.unexpected/get_unexpected.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/exception.unexpected/set.unexpected/get_unexpected.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/exception.unexpected/set.unexpected/get_unexpected.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/exception.unexpected/set.unexpected/set_unexpected.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/exception.unexpected/set.unexpected/set_unexpected.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/exception.unexpected/set.unexpected/set_unexpected.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/exception.unexpected/set.unexpected/set_unexpected.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/exception.unexpected/unexpected.handler/unexpected_handler.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/exception.unexpected/unexpected.handler/unexpected_handler.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/exception.unexpected/unexpected.handler/unexpected_handler.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/exception.unexpected/unexpected.handler/unexpected_handler.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/exception.unexpected/unexpected/unexpected.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/exception.unexpected/unexpected/unexpected.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/exception.unexpected/unexpected/unexpected.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/exception.unexpected/unexpected/unexpected.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/depr/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/depr/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/depr/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/depr/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/assertions/cassert.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/assertions/cassert.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/assertions/cassert.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/assertions/cassert.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/diagnostics.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/diagnostics.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/diagnostics.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/diagnostics.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/errno/cerrno.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/errno/cerrno.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/errno/cerrno.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/errno/cerrno.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/domain.error/domain_error.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/domain.error/domain_error.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/domain.error/domain_error.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/domain.error/domain_error.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/invalid.argument/invalid_argument.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/invalid.argument/invalid_argument.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/invalid.argument/invalid_argument.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/invalid.argument/invalid_argument.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/length.error/length_error.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/length.error/length_error.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/length.error/length_error.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/length.error/length_error.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/logic.error/logic_error.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/logic.error/logic_error.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/logic.error/logic_error.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/logic.error/logic_error.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/out.of.range/out_of_range.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/out.of.range/out_of_range.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/out.of.range/out_of_range.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/out.of.range/out_of_range.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/overflow.error/overflow_error.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/overflow.error/overflow_error.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/overflow.error/overflow_error.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/overflow.error/overflow_error.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/range.error/range_error.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/range.error/range_error.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/range.error/range_error.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/range.error/range_error.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/runtime.error/runtime_error.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/runtime.error/runtime_error.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/runtime.error/runtime_error.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/runtime.error/runtime_error.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/underflow.error/underflow_error.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/underflow.error/underflow_error.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/underflow.error/underflow_error.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/underflow.error/underflow_error.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/std.exceptions/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/std.exceptions/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/errc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/errc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/errc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/errc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.compare/eq_error_code_error_code.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.compare/eq_error_code_error_code.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.compare/eq_error_code_error_code.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.compare/eq_error_code_error_code.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.derived/message.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.derived/message.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.derived/message.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.derived/message.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/lt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/lt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/lt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/lt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/neq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/neq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/neq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.nonvirtuals/neq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.overview/error_category.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.overview/error_category.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.overview/error_category.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.overview/error_category.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/default_error_condition.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/default_error_condition.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/default_error_condition.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/default_error_condition.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/equivalent_error_code_int.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/equivalent_error_code_int.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/equivalent_error_code_int.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/equivalent_error_code_int.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/equivalent_int_error_condition.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/equivalent_int_error_condition.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/equivalent_int_error_condition.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcat/syserr.errcat.virtuals/equivalent_int_error_condition.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/ErrorCodeEnum.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/ErrorCodeEnum.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/ErrorCodeEnum.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/ErrorCodeEnum.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/int_error_category.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/int_error_category.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/int_error_category.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.constructors/int_error_category.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/ErrorCodeEnum.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/ErrorCodeEnum.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/ErrorCodeEnum.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/ErrorCodeEnum.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/clear.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/clear.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/clear.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.modifiers/clear.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/lt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/lt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/lt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/lt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/make_error_code.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/make_error_code.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/make_error_code.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/make_error_code.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/stream_inserter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/stream_inserter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/stream_inserter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/stream_inserter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/bool.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/bool.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/bool.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/bool.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/category.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/category.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/category.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/category.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/default_error_condition.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/default_error_condition.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/default_error_condition.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/default_error_condition.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/message.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/message.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/message.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/message.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.overview/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.overview/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcode/syserr.errcode.overview/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcode/syserr.errcode.overview/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/ErrorConditionEnum.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/ErrorConditionEnum.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/ErrorConditionEnum.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/ErrorConditionEnum.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/int_error_category.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/int_error_category.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/int_error_category.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.constructors/int_error_category.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/ErrorConditionEnum.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/ErrorConditionEnum.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/ErrorConditionEnum.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/ErrorConditionEnum.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/clear.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/clear.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/clear.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.modifiers/clear.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/lt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/lt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/lt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/lt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/make_error_condition.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/make_error_condition.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/make_error_condition.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.nonmembers/make_error_condition.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/bool.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/bool.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/bool.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/bool.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/category.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/category.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/category.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/category.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/message.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/message.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/message.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/message.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.observers/value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.overview/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.overview/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.overview/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.errcondition/syserr.errcondition.overview/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.hash/error_code.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.hash/error_code.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.hash/error_code.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.hash/error_code.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.syserr/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.syserr/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.syserr/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.syserr/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_const_char_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_const_char_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_const_char_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_const_char_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_error_code_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_const_char_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_const_char_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_const_char_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_const_char_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.syserr/syserr.syserr.overview/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.syserr/syserr.syserr.overview/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/syserr.syserr/syserr.syserr.overview/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/syserr.syserr/syserr.syserr.overview/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/diagnostics/syserr/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/diagnostics/syserr/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/c.files/cinttypes.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/c.files/cinttypes.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/c.files/cinttypes.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/c.files/cinttypes.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/c.files/cstdio.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/c.files/cstdio.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/c.files/cstdio.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/c.files/cstdio.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/c.files/version_ccstdio.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/c.files/version_ccstdio.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/c.files/version_ccstdio.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/c.files/version_ccstdio.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/c.files/version_cinttypes.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/c.files/version_cinttypes.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/c.files/version_cinttypes.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/c.files/version_cinttypes.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.assign/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/member_swap.pass.cpp
similarity index 82%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.assign/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/member_swap.pass.cpp
index 10aa05d..8684434 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.assign/member_swap.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/member_swap.pass.cpp
@@ -16,14 +16,14 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
         std::filebuf f;
-        assert(f.open(temp, std::ios_base::out | std::ios_base::in
+        assert(f.open(temp.c_str(), std::ios_base::out | std::ios_base::in
                                                | std::ios_base::trunc) != 0);
         assert(f.is_open());
         assert(f.sputn("123", 3) == 3);
@@ -35,10 +35,10 @@
         assert(f2.is_open());
         assert(f2.sgetc() == '2');
     }
-    remove(temp);
+    std::remove(temp.c_str());
     {
         std::wfilebuf f;
-        assert(f.open(temp, std::ios_base::out | std::ios_base::in
+        assert(f.open(temp.c_str(), std::ios_base::out | std::ios_base::in
                                                | std::ios_base::trunc) != 0);
         assert(f.is_open());
         assert(f.sputn(L"123", 3) == 3);
@@ -50,5 +50,5 @@
         assert(f2.is_open());
         assert(f2.sgetc() == L'2');
     }
-    remove(temp);
+    std::remove(temp.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.assign/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/move_assign.pass.cpp
similarity index 83%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.assign/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/move_assign.pass.cpp
index 739f994..a92ec87 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.assign/move_assign.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/move_assign.pass.cpp
@@ -16,15 +16,15 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
         std::filebuf f;
-        assert(f.open(temp, std::ios_base::out | std::ios_base::in
+        assert(f.open(temp.c_str(), std::ios_base::out | std::ios_base::in
                                                | std::ios_base::trunc) != 0);
         assert(f.is_open());
         assert(f.sputn("123", 3) == 3);
@@ -36,10 +36,10 @@
         assert(f2.is_open());
         assert(f2.sgetc() == '2');
     }
-    remove(temp);
+    std::remove(temp.c_str());
     {
         std::wfilebuf f;
-        assert(f.open(temp, std::ios_base::out | std::ios_base::in
+        assert(f.open(temp.c_str(), std::ios_base::out | std::ios_base::in
                                                | std::ios_base::trunc) != 0);
         assert(f.is_open());
         assert(f.sputn(L"123", 3) == 3);
@@ -51,6 +51,6 @@
         assert(f2.is_open());
         assert(f2.sgetc() == L'2');
     }
-    remove(temp);
+    std::remove(temp.c_str());
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.assign/nonmember_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/nonmember_swap.pass.cpp
similarity index 83%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.assign/nonmember_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/nonmember_swap.pass.cpp
index 9a9b28c..084d001 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.assign/nonmember_swap.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.assign/nonmember_swap.pass.cpp
@@ -18,14 +18,14 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
         std::filebuf f;
-        assert(f.open(temp, std::ios_base::out | std::ios_base::in
+        assert(f.open(temp.c_str(), std::ios_base::out | std::ios_base::in
                                                | std::ios_base::trunc) != 0);
         assert(f.is_open());
         assert(f.sputn("123", 3) == 3);
@@ -37,10 +37,10 @@
         assert(f2.is_open());
         assert(f2.sgetc() == '2');
     }
-    remove(temp);
+    std::remove(temp.c_str());
     {
         std::wfilebuf f;
-        assert(f.open(temp, std::ios_base::out | std::ios_base::in
+        assert(f.open(temp.c_str(), std::ios_base::out | std::ios_base::in
                                                | std::ios_base::trunc) != 0);
         assert(f.is_open());
         assert(f.sputn(L"123", 3) == 3);
@@ -52,5 +52,5 @@
         assert(f2.is_open());
         assert(f2.sgetc() == L'2');
     }
-    remove(temp);
+    std::remove(temp.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.cons/move.pass.cpp
similarity index 83%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.cons/move.pass.cpp
index 352a980..f13ee44 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.cons/move.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.cons/move.pass.cpp
@@ -16,15 +16,15 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
         std::filebuf f;
-        assert(f.open(temp, std::ios_base::out | std::ios_base::in
+        assert(f.open(temp.c_str(), std::ios_base::out | std::ios_base::in
                                                | std::ios_base::trunc) != 0);
         assert(f.is_open());
         assert(f.sputn("123", 3) == 3);
@@ -35,10 +35,10 @@
         assert(f2.is_open());
         assert(f2.sgetc() == '2');
     }
-    remove(temp);
+    std::remove(temp.c_str());
     {
         std::wfilebuf f;
-        assert(f.open(temp, std::ios_base::out | std::ios_base::in
+        assert(f.open(temp.c_str(), std::ios_base::out | std::ios_base::in
                                                | std::ios_base::trunc) != 0);
         assert(f.is_open());
         assert(f.sputn(L"123", 3) == 3);
@@ -49,6 +49,6 @@
         assert(f2.is_open());
         assert(f2.sgetc() == L'2');
     }
-    remove(temp);
+    std::remove(temp.c_str());
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.members/open_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.members/open_pointer.pass.cpp
similarity index 73%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.members/open_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.members/open_pointer.pass.cpp
index 192e65f..9d2d567 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.members/open_pointer.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.members/open_pointer.pass.cpp
@@ -13,39 +13,39 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
         std::filebuf f;
-        assert(f.open(temp, std::ios_base::out) != 0);
+        assert(f.open(temp.c_str(), std::ios_base::out) != 0);
         assert(f.is_open());
         assert(f.sputn("123", 3) == 3);
     }
     {
         std::filebuf f;
-        assert(f.open(temp, std::ios_base::in) != 0);
+        assert(f.open(temp.c_str(), std::ios_base::in) != 0);
         assert(f.is_open());
         assert(f.sbumpc() == '1');
         assert(f.sbumpc() == '2');
         assert(f.sbumpc() == '3');
     }
-    remove(temp);
+    std::remove(temp.c_str());
     {
         std::wfilebuf f;
-        assert(f.open(temp, std::ios_base::out) != 0);
+        assert(f.open(temp.c_str(), std::ios_base::out) != 0);
         assert(f.is_open());
         assert(f.sputn(L"123", 3) == 3);
     }
     {
         std::wfilebuf f;
-        assert(f.open(temp, std::ios_base::in) != 0);
+        assert(f.open(temp.c_str(), std::ios_base::in) != 0);
         assert(f.is_open());
         assert(f.sbumpc() == L'1');
         assert(f.sbumpc() == L'2');
         assert(f.sbumpc() == L'3');
     }
-    remove(temp);
+    remove(temp.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/overflow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.virtuals/pbackfail.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/pbackfail.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.virtuals/pbackfail.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/pbackfail.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.virtuals/seekoff.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/seekoff.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.virtuals/seekoff.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/seekoff.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.dat b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.dat
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.dat
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.dat
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow_utf8.dat b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow_utf8.dat
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow_utf8.dat
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf.virtuals/underflow_utf8.dat
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/filebuf/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/filebuf/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.assign/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.assign/member_swap.pass.cpp
similarity index 72%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.assign/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.assign/member_swap.pass.cpp
index 4cae835..fcc86a1 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.assign/member_swap.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.assign/member_swap.pass.cpp
@@ -16,16 +16,16 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp1[L_tmpnam], temp2[L_tmpnam];
-    tmpnam(temp1);
-    tmpnam(temp2);
+    std::string temp1 = get_temp_file_name();
+    std::string temp2 = get_temp_file_name();
     {
-        std::fstream fs1(temp1, std::ios_base::in | std::ios_base::out
+        std::fstream fs1(temp1.c_str(), std::ios_base::in | std::ios_base::out
                                                   | std::ios_base::trunc);
-        std::fstream fs2(temp2, std::ios_base::in | std::ios_base::out
+        std::fstream fs2(temp2.c_str(), std::ios_base::in | std::ios_base::out
                                                   | std::ios_base::trunc);
         fs1 << 1 << ' ' << 2;
         fs2 << 2 << ' ' << 1;
@@ -43,12 +43,12 @@
         fs2 >> i;
         assert(i == 2);
     }
-    std::remove(temp1);
-    std::remove(temp2);
+    std::remove(temp1.c_str());
+    std::remove(temp2.c_str());
     {
-        std::wfstream fs1(temp1, std::ios_base::in | std::ios_base::out
+        std::wfstream fs1(temp1.c_str(), std::ios_base::in | std::ios_base::out
                                                    | std::ios_base::trunc);
-        std::wfstream fs2(temp2, std::ios_base::in | std::ios_base::out
+        std::wfstream fs2(temp2.c_str(), std::ios_base::in | std::ios_base::out
                                                    | std::ios_base::trunc);
         fs1 << 1 << ' ' << 2;
         fs2 << 2 << ' ' << 1;
@@ -66,6 +66,6 @@
         fs2 >> i;
         assert(i == 2);
     }
-    std::remove(temp1);
-    std::remove(temp2);
+    std::remove(temp1.c_str());
+    std::remove(temp2.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.assign/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.assign/move_assign.pass.cpp
similarity index 79%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.assign/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.assign/move_assign.pass.cpp
index 51cf41f..b5157e9 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.assign/move_assign.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.assign/move_assign.pass.cpp
@@ -16,14 +16,14 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
-        std::fstream fso(temp, std::ios_base::in | std::ios_base::out
+        std::fstream fso(temp.c_str(), std::ios_base::in | std::ios_base::out
                                                  | std::ios_base::trunc);
         std::fstream fs;
         fs = move(fso);
@@ -33,9 +33,9 @@
         fs >> x;
         assert(x == 3.25);
     }
-    std::remove(temp);
+    std::remove(temp.c_str());
     {
-        std::wfstream fso(temp, std::ios_base::in | std::ios_base::out
+        std::wfstream fso(temp.c_str(), std::ios_base::in | std::ios_base::out
                                                   | std::ios_base::trunc);
         std::wfstream fs;
         fs = move(fso);
@@ -45,6 +45,6 @@
         fs >> x;
         assert(x == 3.25);
     }
-    std::remove(temp);
+    std::remove(temp.c_str());
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.assign/nonmember_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.assign/nonmember_swap.pass.cpp
similarity index 73%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.assign/nonmember_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.assign/nonmember_swap.pass.cpp
index 27ee842..0a4f724 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.assign/nonmember_swap.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.assign/nonmember_swap.pass.cpp
@@ -17,16 +17,16 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp1[L_tmpnam], temp2[L_tmpnam];
-    tmpnam(temp1);
-    tmpnam(temp2);
+    std::string temp1 = get_temp_file_name();
+    std::string temp2 = get_temp_file_name();
     {
-        std::fstream fs1(temp1, std::ios_base::in | std::ios_base::out
+        std::fstream fs1(temp1.c_str(), std::ios_base::in | std::ios_base::out
                                                   | std::ios_base::trunc);
-        std::fstream fs2(temp2, std::ios_base::in | std::ios_base::out
+        std::fstream fs2(temp2.c_str(), std::ios_base::in | std::ios_base::out
                                                   | std::ios_base::trunc);
         fs1 << 1 << ' ' << 2;
         fs2 << 2 << ' ' << 1;
@@ -44,12 +44,12 @@
         fs2 >> i;
         assert(i == 2);
     }
-    std::remove(temp1);
-    std::remove(temp2);
+    std::remove(temp1.c_str());
+    std::remove(temp2.c_str());
     {
-        std::wfstream fs1(temp1, std::ios_base::in | std::ios_base::out
+        std::wfstream fs1(temp1.c_str(), std::ios_base::in | std::ios_base::out
                                                    | std::ios_base::trunc);
-        std::wfstream fs2(temp2, std::ios_base::in | std::ios_base::out
+        std::wfstream fs2(temp2.c_str(), std::ios_base::in | std::ios_base::out
                                                    | std::ios_base::trunc);
         fs1 << 1 << ' ' << 2;
         fs2 << 2 << ' ' << 1;
@@ -67,6 +67,6 @@
         fs2 >> i;
         assert(i == 2);
     }
-    std::remove(temp1);
-    std::remove(temp2);
+    std::remove(temp1.c_str());
+    std::remove(temp2.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.cons/move.pass.cpp
similarity index 89%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.cons/move.pass.cpp
index 28e3c95..d2ae302 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.cons/move.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.cons/move.pass.cpp
@@ -16,12 +16,12 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
         std::fstream fso(temp, std::ios_base::in | std::ios_base::out
                                                  | std::ios_base::trunc);
@@ -32,7 +32,7 @@
         fs >> x;
         assert(x == 3.25);
     }
-    std::remove("test.dat");
+    std::remove(temp.c_str());
     {
         std::wfstream fso(temp, std::ios_base::in | std::ios_base::out
                                                   | std::ios_base::trunc);
@@ -43,6 +43,6 @@
         fs >> x;
         assert(x == 3.25);
     }
-    std::remove(temp);
+    std::remove(temp.c_str());
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.cons/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.cons/pointer.pass.cpp
similarity index 77%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.cons/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.cons/pointer.pass.cpp
index a31f9a1..06a6b77 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.cons/pointer.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.cons/pointer.pass.cpp
@@ -16,13 +16,13 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
-        std::fstream fs(temp, std::ios_base::in | std::ios_base::out
+        std::fstream fs(temp.c_str(), std::ios_base::in | std::ios_base::out
                                                 | std::ios_base::trunc);
         double x = 0;
         fs << 3.25;
@@ -30,9 +30,9 @@
         fs >> x;
         assert(x == 3.25);
     }
-    std::remove(temp);
+    std::remove(temp.c_str());
     {
-        std::wfstream fs(temp, std::ios_base::in | std::ios_base::out
+        std::wfstream fs(temp.c_str(), std::ios_base::in | std::ios_base::out
                                                  | std::ios_base::trunc);
         double x = 0;
         fs << 3.25;
@@ -40,5 +40,5 @@
         fs >> x;
         assert(x == 3.25);
     }
-    std::remove(temp);
+    std::remove(temp.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.cons/string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.cons/string.pass.cpp
similarity index 84%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.cons/string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.cons/string.pass.cpp
index 23795f0..4b0819f 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.cons/string.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.cons/string.pass.cpp
@@ -16,13 +16,13 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
-        std::fstream fs(std::string(temp),
+        std::fstream fs(temp,
                         std::ios_base::in | std::ios_base::out
                                           | std::ios_base::trunc);
         double x = 0;
@@ -31,9 +31,9 @@
         fs >> x;
         assert(x == 3.25);
     }
-    std::remove(temp);
+    std::remove(temp.c_str());
     {
-        std::wfstream fs(std::string(temp),
+        std::wfstream fs(temp,
                          std::ios_base::in | std::ios_base::out
                                            | std::ios_base::trunc);
         double x = 0;
@@ -42,5 +42,5 @@
         fs >> x;
         assert(x == 3.25);
     }
-    std::remove(temp);
+    std::remove(temp.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.members/close.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.members/close.pass.cpp
similarity index 77%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.members/close.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.members/close.pass.cpp
index 94b9180..0e4bc71 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.members/close.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.members/close.pass.cpp
@@ -16,27 +16,27 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
         std::fstream fs;
         assert(!fs.is_open());
-        fs.open(temp, std::ios_base::out);
+        fs.open(temp.c_str(), std::ios_base::out);
         assert(fs.is_open());
         fs.close();
         assert(!fs.is_open());
     }
-    remove(temp);
+    std::remove(temp.c_str());
     {
         std::wfstream fs;
         assert(!fs.is_open());
-        fs.open(temp, std::ios_base::out);
+        fs.open(temp.c_str(), std::ios_base::out);
         assert(fs.is_open());
         fs.close();
         assert(!fs.is_open());
     }
-    remove(temp);
+    std::remove(temp.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.members/open_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.members/open_pointer.pass.cpp
similarity index 80%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.members/open_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.members/open_pointer.pass.cpp
index 64c4de9..231bb82 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.members/open_pointer.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.members/open_pointer.pass.cpp
@@ -16,15 +16,15 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
         std::fstream fs;
         assert(!fs.is_open());
-        fs.open(temp, std::ios_base::in | std::ios_base::out
+        fs.open(temp.c_str(), std::ios_base::in | std::ios_base::out
                                         | std::ios_base::trunc);
         assert(fs.is_open());
         double x = 0;
@@ -33,11 +33,11 @@
         fs >> x;
         assert(x == 3.25);
     }
-    std::remove(temp);
+    std::remove(temp.c_str());
     {
         std::wfstream fs;
         assert(!fs.is_open());
-        fs.open(temp, std::ios_base::in | std::ios_base::out
+        fs.open(temp.c_str(), std::ios_base::in | std::ios_base::out
                                         | std::ios_base::trunc);
         assert(fs.is_open());
         double x = 0;
@@ -46,5 +46,5 @@
         fs >> x;
         assert(x == 3.25);
     }
-    std::remove(temp);
+    std::remove(temp.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.members/open_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.members/open_string.pass.cpp
similarity index 81%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.members/open_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.members/open_string.pass.cpp
index a61a4e9..182f12c 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.members/open_string.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.members/open_string.pass.cpp
@@ -16,15 +16,15 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
         std::fstream fs;
         assert(!fs.is_open());
-        fs.open(std::string(temp), std::ios_base::in | std::ios_base::out
+        fs.open(temp, std::ios_base::in | std::ios_base::out
                                                      | std::ios_base::trunc);
         assert(fs.is_open());
         double x = 0;
@@ -33,11 +33,11 @@
         fs >> x;
         assert(x == 3.25);
     }
-    std::remove(temp);
+    std::remove(temp.c_str());
     {
         std::wfstream fs;
         assert(!fs.is_open());
-        fs.open(std::string(temp), std::ios_base::in | std::ios_base::out
+        fs.open(temp, std::ios_base::in | std::ios_base::out
                                                      | std::ios_base::trunc);
         assert(fs.is_open());
         double x = 0;
@@ -46,5 +46,5 @@
         fs >> x;
         assert(x == 3.25);
     }
-    std::remove(temp);
+    std::remove(temp.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.members/rdbuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.members/rdbuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream.members/rdbuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream.members/rdbuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/fstream/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/fstream/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.assign/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.assign/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.assign/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/move_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.assign/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/move_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.assign/nonmember_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/nonmember_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.assign/nonmember_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/nonmember_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.assign/test.dat b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/test.dat
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.assign/test.dat
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/test.dat
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.assign/test2.dat b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/test2.dat
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.assign/test2.dat
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.assign/test2.dat
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.cons/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.cons/pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.cons/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.cons/pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.cons/string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.cons/string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.cons/string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.cons/string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.cons/test.dat b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.cons/test.dat
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.cons/test.dat
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.cons/test.dat
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.members/close.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.members/close.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.members/close.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.members/close.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.members/open_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.members/open_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.members/open_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.members/open_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.members/open_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.members/open_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.members/open_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.members/open_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.members/rdbuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.members/rdbuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.members/rdbuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.members/rdbuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.members/test.dat b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.members/test.dat
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream.members/test.dat
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream.members/test.dat
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ifstream/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ifstream/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.assign/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/member_swap.pass.cpp
similarity index 68%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.assign/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/member_swap.pass.cpp
index 7800c1a..519b84f 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.assign/member_swap.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/member_swap.pass.cpp
@@ -16,15 +16,15 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp1[L_tmpnam], temp2[L_tmpnam];
-    tmpnam(temp1);
-    tmpnam(temp2);
+    std::string temp1 = get_temp_file_name();
+    std::string temp2 = get_temp_file_name();
     {
-        std::ofstream fs1(temp1);
-        std::ofstream fs2(temp2);
+        std::ofstream fs1(temp1.c_str());
+        std::ofstream fs2(temp2.c_str());
         fs1 << 3.25;
         fs2 << 4.5;
         fs1.swap(fs2);
@@ -32,26 +32,26 @@
         fs2 << ' ' << 4.5;
     }
     {
-        std::ifstream fs(temp1);
+        std::ifstream fs(temp1.c_str());
         double x = 0;
         fs >> x;
         assert(x == 3.25);
         fs >> x;
         assert(x == 4.5);
     }
-    remove(temp1);
+    std::remove(temp1.c_str());
     {
-        std::ifstream fs(temp2);
+        std::ifstream fs(temp2.c_str());
         double x = 0;
         fs >> x;
         assert(x == 4.5);
         fs >> x;
         assert(x == 3.25);
     }
-    remove(temp2);
+    std::remove(temp2.c_str());
     {
-        std::wofstream fs1(temp1);
-        std::wofstream fs2(temp2);
+        std::wofstream fs1(temp1.c_str());
+        std::wofstream fs2(temp2.c_str());
         fs1 << 3.25;
         fs2 << 4.5;
         fs1.swap(fs2);
@@ -59,21 +59,21 @@
         fs2 << ' ' << 4.5;
     }
     {
-        std::wifstream fs(temp1);
+        std::wifstream fs(temp1.c_str());
         double x = 0;
         fs >> x;
         assert(x == 3.25);
         fs >> x;
         assert(x == 4.5);
     }
-    remove(temp1);
+    std::remove(temp1.c_str());
     {
-        std::wifstream fs(temp2);
+        std::wifstream fs(temp2.c_str());
         double x = 0;
         fs >> x;
         assert(x == 4.5);
         fs >> x;
         assert(x == 3.25);
     }
-    remove(temp2);
+    std::remove(temp2.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.assign/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/move_assign.pass.cpp
similarity index 76%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.assign/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/move_assign.pass.cpp
index 7f80cfc..0f21eb8 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.assign/move_assign.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/move_assign.pass.cpp
@@ -16,37 +16,37 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
-        std::ofstream fso(temp);
+        std::ofstream fso(temp.c_str());
         std::ofstream fs;
         fs = move(fso);
         fs << 3.25;
     }
     {
-        std::ifstream fs(temp);
+        std::ifstream fs(temp.c_str());
         double x = 0;
         fs >> x;
         assert(x == 3.25);
     }
-    remove(temp);
+    std::remove(temp.c_str());
     {
-        std::wofstream fso(temp);
+        std::wofstream fso(temp.c_str());
         std::wofstream fs;
         fs = move(fso);
         fs << 3.25;
     }
     {
-        std::wifstream fs(temp);
+        std::wifstream fs(temp.c_str());
         double x = 0;
         fs >> x;
         assert(x == 3.25);
     }
-    remove(temp);
+    std::remove(temp.c_str());
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.assign/nonmember_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/nonmember_swap.pass.cpp
similarity index 70%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.assign/nonmember_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/nonmember_swap.pass.cpp
index 24deafd..d58f5f2 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.assign/nonmember_swap.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.assign/nonmember_swap.pass.cpp
@@ -17,15 +17,15 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp1[L_tmpnam], temp2[L_tmpnam];
-    tmpnam(temp1);
-    tmpnam(temp2);
+    std::string temp1 = get_temp_file_name();
+    std::string temp2 = get_temp_file_name();
     {
-        std::ofstream fs1(temp1);
-        std::ofstream fs2(temp2);
+        std::ofstream fs1(temp1.c_str());
+        std::ofstream fs2(temp2.c_str());
         fs1 << 3.25;
         fs2 << 4.5;
         swap(fs1, fs2);
@@ -33,26 +33,26 @@
         fs2 << ' ' << 4.5;
     }
     {
-        std::ifstream fs(temp1);
+        std::ifstream fs(temp1.c_str());
         double x = 0;
         fs >> x;
         assert(x == 3.25);
         fs >> x;
         assert(x == 4.5);
     }
-    remove(temp1);
+    std::remove(temp1.c_str());
     {
-        std::ifstream fs(temp2);
+        std::ifstream fs(temp2.c_str());
         double x = 0;
         fs >> x;
         assert(x == 4.5);
         fs >> x;
         assert(x == 3.25);
     }
-    remove(temp2);
+    std::remove(temp2.c_str());
     {
-        std::wofstream fs1(temp1);
-        std::wofstream fs2(temp2);
+        std::wofstream fs1(temp1.c_str());
+        std::wofstream fs2(temp2.c_str());
         fs1 << 3.25;
         fs2 << 4.5;
         swap(fs1, fs2);
@@ -60,21 +60,21 @@
         fs2 << ' ' << 4.5;
     }
     {
-        std::wifstream fs(temp1);
+        std::wifstream fs(temp1.c_str());
         double x = 0;
         fs >> x;
         assert(x == 3.25);
         fs >> x;
         assert(x == 4.5);
     }
-    remove(temp1);
+    std::remove(temp1.c_str());
     {
-        std::wifstream fs(temp2);
+        std::wifstream fs(temp2.c_str());
         double x = 0;
         fs >> x;
         assert(x == 4.5);
         fs >> x;
         assert(x == 3.25);
     }
-    remove(temp2);
+    std::remove(temp2.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.cons/move.pass.cpp
similarity index 75%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.cons/move.pass.cpp
index 93bea0e..8645358 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.cons/move.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.cons/move.pass.cpp
@@ -16,35 +16,35 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
 #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
-        std::ofstream fso(temp);
+        std::ofstream fso(temp.c_str());
         std::ofstream fs = move(fso);
         fs << 3.25;
     }
     {
-        std::ifstream fs(temp);
+        std::ifstream fs(temp.c_str());
         double x = 0;
         fs >> x;
         assert(x == 3.25);
     }
-    remove(temp);
+    std::remove(temp.c_str());
     {
-        std::wofstream fso(temp);
+        std::wofstream fso(temp.c_str());
         std::wofstream fs = move(fso);
         fs << 3.25;
     }
     {
-        std::wifstream fs(temp);
+        std::wifstream fs(temp.c_str());
         double x = 0;
         fs >> x;
         assert(x == 3.25);
     }
-    remove(temp);
+    std::remove(temp.c_str());
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.cons/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.cons/pointer.pass.cpp
similarity index 73%
copy from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.cons/pointer.pass.cpp
copy to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.cons/pointer.pass.cpp
index 7d899e7..bd5832a 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.cons/pointer.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.cons/pointer.pass.cpp
@@ -16,31 +16,31 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
-        std::ofstream fs(temp);
+        std::ofstream fs(temp.c_str());
         fs << 3.25;
     }
     {
-        std::ifstream fs(temp);
+        std::ifstream fs(temp.c_str());
         double x = 0;
         fs >> x;
         assert(x == 3.25);
     }
-    remove(temp);
+    std::remove(temp.c_str());
     {
-        std::wofstream fs(temp);
+        std::wofstream fs(temp.c_str());
         fs << 3.25;
     }
     {
-        std::wifstream fs(temp);
+        std::wifstream fs(temp.c_str());
         double x = 0;
         fs >> x;
         assert(x == 3.25);
     }
-    remove(temp);
+    std::remove(temp.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.cons/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.cons/string.pass.cpp
similarity index 79%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.cons/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.cons/string.pass.cpp
index 7d899e7..7112b17 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.cons/pointer.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.cons/string.pass.cpp
@@ -12,15 +12,15 @@
 // template <class charT, class traits = char_traits<charT> >
 // class basic_ofstream
 
-// explicit basic_ofstream(const char* s, ios_base::openmode mode = ios_base::out);
+// explicit basic_ofstream(const string& s, ios_base::openmode mode = ios_base::out);
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
         std::ofstream fs(temp);
         fs << 3.25;
@@ -31,7 +31,7 @@
         fs >> x;
         assert(x == 3.25);
     }
-    remove(temp);
+    std::remove(temp.c_str());
     {
         std::wofstream fs(temp);
         fs << 3.25;
@@ -42,5 +42,5 @@
         fs >> x;
         assert(x == 3.25);
     }
-    remove(temp);
+    std::remove(temp.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.members/close.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.members/close.pass.cpp
similarity index 80%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.members/close.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.members/close.pass.cpp
index ad3f378..b8c358d 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.members/close.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.members/close.pass.cpp
@@ -16,27 +16,27 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
         std::ofstream fs;
         assert(!fs.is_open());
-        fs.open(temp);
+        fs.open(temp.c_str());
         assert(fs.is_open());
         fs.close();
         assert(!fs.is_open());
     }
-    remove(temp);
+    std::remove(temp.c_str());
     {
         std::wofstream fs;
         assert(!fs.is_open());
-        fs.open(temp);
+        fs.open(temp.c_str());
         assert(fs.is_open());
         fs.close();
         assert(!fs.is_open());
     }
-    remove(temp);
+    std::remove(temp.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.members/open_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.members/open_pointer.pass.cpp
similarity index 79%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.members/open_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.members/open_pointer.pass.cpp
index bf8e6a5..e5cddc9 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.members/open_pointer.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.members/open_pointer.pass.cpp
@@ -16,43 +16,43 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
         std::ofstream fs;
         assert(!fs.is_open());
         char c = 'a';
         fs << c;
         assert(fs.fail());
-        fs.open(temp);
+        fs.open(temp.c_str());
         assert(fs.is_open());
         fs << c;
     }
     {
-        std::ifstream fs(temp);
+        std::ifstream fs(temp.c_str());
         char c = 0;
         fs >> c;
         assert(c == 'a');
     }
-    remove(temp);
+    std::remove(temp.c_str());
     {
         std::wofstream fs;
         assert(!fs.is_open());
         wchar_t c = L'a';
         fs << c;
         assert(fs.fail());
-        fs.open(temp);
+        fs.open(temp.c_str());
         assert(fs.is_open());
         fs << c;
     }
     {
-        std::wifstream fs(temp);
+        std::wifstream fs(temp.c_str());
         wchar_t c = 0;
         fs >> c;
         assert(c == L'a');
     }
-    remove(temp);
+    std::remove(temp.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.members/open_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.members/open_string.pass.cpp
similarity index 80%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.members/open_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.members/open_string.pass.cpp
index b33114d..d54aa18 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.members/open_string.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.members/open_string.pass.cpp
@@ -16,43 +16,43 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
         std::ofstream fs;
         assert(!fs.is_open());
         char c = 'a';
         fs << c;
         assert(fs.fail());
-        fs.open(std::string(temp));
+        fs.open(temp);
         assert(fs.is_open());
         fs << c;
     }
     {
-        std::ifstream fs(temp);
+        std::ifstream fs(temp.c_str());
         char c = 0;
         fs >> c;
         assert(c == 'a');
     }
-    remove(temp);
+    std::remove(temp.c_str());
     {
         std::wofstream fs;
         assert(!fs.is_open());
         wchar_t c = L'a';
         fs << c;
         assert(fs.fail());
-        fs.open(std::string(temp));
+        fs.open(temp);
         assert(fs.is_open());
         fs << c;
     }
     {
-        std::wifstream fs(temp);
+        std::wifstream fs(temp.c_str());
         wchar_t c = 0;
         fs >> c;
         assert(c == L'a');
     }
-    remove(temp);
+    std::remove(temp.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.members/rdbuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.members/rdbuf.pass.cpp
similarity index 77%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.members/rdbuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.members/rdbuf.pass.cpp
index 8860c9a..d707e0a 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.members/rdbuf.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream.members/rdbuf.pass.cpp
@@ -16,21 +16,21 @@
 
 #include <fstream>
 #include <cassert>
+#include "platform_support.h"
 
 int main()
 {
-    char temp[L_tmpnam];
-    tmpnam(temp);
+    std::string temp = get_temp_file_name();
     {
-        std::ofstream fs(temp);
+        std::ofstream fs(temp.c_str());
         std::filebuf* fb = fs.rdbuf();
         assert(fb->sputc('r') == 'r');
     }
-    remove(temp);
+    std::remove(temp.c_str());
     {
-        std::wofstream fs(temp);
+        std::wofstream fs(temp.c_str());
         std::wfilebuf* fb = fs.rdbuf();
         assert(fb->sputc(L'r') == L'r');
     }
-    remove(temp);
+    std::remove(temp.c_str());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/ofstream/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/fstreams/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/file.streams/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/file.streams/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/input.output.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/input.output.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/input.output.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/input.output.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/ext.manip/get_money.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/ext.manip/get_money.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/ext.manip/get_money.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/ext.manip/get_money.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/ext.manip/get_time.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/ext.manip/get_time.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/ext.manip/get_time.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/ext.manip/put_money.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/ext.manip/put_money.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/ext.manip/put_money.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/ext.manip/put_money.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/ext.manip/put_time.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/ext.manip/put_time.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/ext.manip/put_time.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/ext.manip/put_time.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/iostreamclass/iostream.assign/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.assign/member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/iostreamclass/iostream.assign/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.assign/member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/iostreamclass/iostream.assign/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.assign/move_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/iostreamclass/iostream.assign/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.assign/move_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/iostreamclass/iostream.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/iostreamclass/iostream.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/iostreamclass/iostream.cons/streambuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.cons/streambuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/iostreamclass/iostream.cons/streambuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.cons/streambuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/iostreamclass/iostream.dest/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.dest/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/iostreamclass/iostream.dest/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/iostream.dest/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/iostreamclass/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/iostreamclass/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/iostreamclass/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/bool.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/bool.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/bool.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/bool.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/float.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/float.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/float.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/float.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/int.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/int.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/int.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/int.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_long.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_long.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_long.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_long.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/short.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/short.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/short.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/short.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_int.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_int.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_int.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_int.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long_long.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long_long.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long_long.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long_long.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_short.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_short.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_short.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_short.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.reqmts/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.reqmts/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.reqmts/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.reqmts/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/basic_ios.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/basic_ios.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/basic_ios.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/basic_ios.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/chart.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/chart.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/chart.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/chart.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/ios_base.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/ios_base.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/ios_base.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/ios_base.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/istream.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/istream.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/istream.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/istream.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/signed_char_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/unsigned_char_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/wchar_t_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/wchar_t_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/wchar_t_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/wchar_t_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.formatted/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.formatted/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.manip/ws.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.manip/ws.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.manip/ws.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.manip/ws.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.rvalue/rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.rvalue/rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.rvalue/rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.rvalue/rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/get.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/get.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get.pass.cpp
index 41a721d..1309a00 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/get.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: with_system_lib=x86_64-apple-darwin11
 
 // <istream>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/get_chart.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_chart.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/get_chart.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_chart.pass.cpp
index cf06e34..ee46566 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/get_chart.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_chart.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: with_system_lib=x86_64-apple-darwin11
 
 // <istream>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size_chart.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size_chart.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size_chart.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size_chart.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size_chart.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size_chart.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size_chart.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size_chart.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/ignore.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/ignore.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/ignore.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/ignore.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/peek.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/peek.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/peek.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/peek.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/putback.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/putback.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/putback.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/putback.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/read.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/read.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/read.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/read.pass.cpp
index 20e70cf..b57014a 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/read.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/read.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: with_system_lib=x86_64-apple-darwin11
 
 // <istream>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/readsome.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/readsome.pass.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/readsome.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/readsome.pass.cpp
index 01eecb5..60f816d 100644
--- a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/readsome.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/readsome.pass.cpp
@@ -6,6 +6,9 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <istream>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/seekg.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/seekg.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/seekg.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/seekg.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/seekg_off.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/seekg_off.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/seekg_off.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/seekg_off.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/sync.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/sync.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/sync.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/sync.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/tellg.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/tellg.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/tellg.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/tellg.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/unget.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/unget.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream.unformatted/unget.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream.unformatted/unget.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream/istream.assign/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream/istream.assign/member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream/istream.assign/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream/istream.assign/member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream/istream.assign/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream/istream.assign/move_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream/istream.assign/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream/istream.assign/move_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream/istream.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream/istream.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream/istream.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream/istream.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream/istream.cons/streambuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream/istream.cons/streambuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream/istream.cons/streambuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream/istream.cons/streambuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream/istream_sentry/ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream/istream_sentry/ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream/istream_sentry/ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream/istream_sentry/ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/istream/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/istream/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/input.streams/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/input.streams/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.assign/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.assign/member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.assign/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.assign/member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.assign/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.assign/move_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.assign/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.assign/move_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.cons/streambuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.cons/streambuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.cons/streambuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.cons/streambuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.reqmts/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.reqmts/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.reqmts/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.reqmts/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/bool.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/bool.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/bool.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/bool.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/float.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/float.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/float.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/float.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/int.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/int.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/int.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/int.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_long.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_long.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_long.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_long.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/short.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/short.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/short.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/short.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_int.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_int.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_int.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_int.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_short.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_short.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_short.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_short.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/basic_ios.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/basic_ios.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/basic_ios.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/basic_ios.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ios_base.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ios_base.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ios_base.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ios_base.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ostream.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ostream.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ostream.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/ostream.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/streambuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/streambuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/streambuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters/streambuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.manip/flush.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/flush.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.manip/flush.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.manip/flush.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.rvalue/CharT_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.rvalue/CharT_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.rvalue/CharT_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.rvalue/CharT_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.seeks/seekp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/seekp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.seeks/seekp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/seekp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.seeks/seekp2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/seekp2.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.seeks/seekp2.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/seekp2.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.seeks/tellp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/tellp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.seeks/tellp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.seeks/tellp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.unformatted/flush.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.unformatted/flush.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.unformatted/flush.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.unformatted/flush.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.unformatted/put.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.unformatted/put.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.unformatted/put.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.unformatted/put.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.unformatted/write.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.unformatted/write.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream.unformatted/write.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream.unformatted/write.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream_sentry/construct.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream_sentry/construct.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream_sentry/construct.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream_sentry/construct.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream_sentry/destruct.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream_sentry/destruct.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/ostream_sentry/destruct.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/ostream_sentry/destruct.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/output.streams/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/output.streams/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/std.manip/resetiosflags.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/std.manip/resetiosflags.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/std.manip/resetiosflags.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/std.manip/resetiosflags.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/std.manip/setbase.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/std.manip/setbase.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/std.manip/setbase.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/std.manip/setbase.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/std.manip/setfill.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/std.manip/setfill.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/std.manip/setfill.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/std.manip/setfill.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/std.manip/setiosflags.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/std.manip/setiosflags.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/std.manip/setiosflags.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/std.manip/setiosflags.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/std.manip/setprecision.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/std.manip/setprecision.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/std.manip/setprecision.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/std.manip/setprecision.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/std.manip/setw.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/std.manip/setw.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/std.manip/setw.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/std.manip/setw.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/std.manip/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/std.manip/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.format/std.manip/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.format/std.manip/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.forward/iosfwd.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.forward/iosfwd.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.forward/iosfwd.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.forward/iosfwd.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.forward/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.forward/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.forward/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.forward/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/narrow.stream.objects/cerr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cerr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/narrow.stream.objects/cerr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cerr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/narrow.stream.objects/cin.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cin.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/narrow.stream.objects/cin.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cin.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/narrow.stream.objects/clog.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/narrow.stream.objects/clog.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/narrow.stream.objects/clog.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/narrow.stream.objects/clog.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/narrow.stream.objects/cout.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cout.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/narrow.stream.objects/cout.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/narrow.stream.objects/cout.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/wide.stream.objects/wcerr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/wide.stream.objects/wcerr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/wide.stream.objects/wcerr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/wide.stream.objects/wcerr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/wide.stream.objects/wcin.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/wide.stream.objects/wcin.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/wide.stream.objects/wcin.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/wide.stream.objects/wcin.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/wide.stream.objects/wclog.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/wide.stream.objects/wclog.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/wide.stream.objects/wclog.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/wide.stream.objects/wclog.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/wide.stream.objects/wcout.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/wide.stream.objects/wcout.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostream.objects/wide.stream.objects/wcout.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostream.objects/wide.stream.objects/wcout.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/fpos.members/state.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/fpos.members/state.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/fpos.members/state.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/fpos.members/state.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/fpos.operations/addition.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/fpos.operations/addition.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/fpos.operations/addition.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/fpos.operations/addition.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/fpos.operations/ctor_int.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/fpos.operations/ctor_int.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/fpos.operations/ctor_int.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/fpos.operations/ctor_int.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/fpos.operations/difference.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/fpos.operations/difference.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/fpos.operations/difference.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/fpos.operations/difference.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/fpos.operations/eq_int.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/fpos.operations/eq_int.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/fpos.operations/eq_int.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/fpos.operations/eq_int.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/fpos.operations/offset.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/fpos.operations/offset.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/fpos.operations/offset.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/fpos.operations/offset.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/fpos.operations/streamsize.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/fpos.operations/streamsize.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/fpos.operations/streamsize.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/fpos.operations/streamsize.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/fpos.operations/subtraction.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/fpos.operations/subtraction.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/fpos.operations/subtraction.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/fpos.operations/subtraction.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/fpos/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/fpos/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/flags.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/flags.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/flags.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/flags.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/flags_fmtflags.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/flags_fmtflags.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/flags_fmtflags.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/flags_fmtflags.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/precision.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/precision.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/precision.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/precision.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/precision_streamsize.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/precision_streamsize.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/precision_streamsize.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/precision_streamsize.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/setf_fmtflags.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/setf_fmtflags.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/setf_fmtflags.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/setf_fmtflags.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/setf_fmtflags_mask.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/setf_fmtflags_mask.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/setf_fmtflags_mask.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/setf_fmtflags_mask.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/unsetf_mask.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/unsetf_mask.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/unsetf_mask.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/unsetf_mask.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/width.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/width.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/width.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/width.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/width_streamsize.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/width_streamsize.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/fmtflags.state/width_streamsize.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/fmtflags.state/width_streamsize.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.base.callback/register_callback.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.base.callback/register_callback.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.base.callback/register_callback.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.base.callback/register_callback.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.base.cons/dtor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.base.cons/dtor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.base.cons/dtor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.base.cons/dtor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.base.locales/getloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.base.locales/getloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.base.locales/getloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.base.locales/getloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.base.locales/imbue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.base.locales/imbue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.base.locales/imbue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.base.locales/imbue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.base.storage/xalloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.base.storage/xalloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.base.storage/xalloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.base.storage/xalloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.members.static/sync_with_stdio.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.members.static/sync_with_stdio.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.members.static/sync_with_stdio.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.members.static/sync_with_stdio.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.types/ios_Init/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_Init/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.types/ios_Init/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_Init/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_char_pointer_error_code.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_char_pointer_error_code.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_char_pointer_error_code.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_char_pointer_error_code.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_string_error_code.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_string_error_code.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_string_error_code.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_failure/ctor_string_error_code.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.types/ios_fmtflags/fmtflags.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_fmtflags/fmtflags.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.types/ios_fmtflags/fmtflags.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_fmtflags/fmtflags.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.types/ios_iostate/iostate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_iostate/iostate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.types/ios_iostate/iostate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_iostate/iostate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.types/ios_openmode/openmode.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_openmode/openmode.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.types/ios_openmode/openmode.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_openmode/openmode.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.types/ios_seekdir/seekdir.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_seekdir/seekdir.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.types/ios_seekdir/seekdir.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.types/ios_seekdir/seekdir.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.types/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.types/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/ios.types/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/ios.types/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios.base/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios.base/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.cons/ctor_streambuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.cons/ctor_streambuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.cons/ctor_streambuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.cons/ctor_streambuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/copyfmt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/copyfmt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/copyfmt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/copyfmt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/fill.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/fill.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/fill.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/fill.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/fill_char_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/fill_char_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/fill_char_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/fill_char_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/imbue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/imbue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/imbue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/imbue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/narow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/narow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/narow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/narow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/rdbuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/rdbuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/rdbuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/rdbuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/rdbuf_streambuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/rdbuf_streambuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/rdbuf_streambuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/rdbuf_streambuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/set_rdbuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/set_rdbuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/set_rdbuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/set_rdbuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/tie.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/tie.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/tie.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/tie.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/tie_ostream.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/tie_ostream.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/tie_ostream.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/tie_ostream.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/widen.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/widen.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/basic.ios.members/widen.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/basic.ios.members/widen.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/bad.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/bad.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/bad.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/bad.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/bool.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/bool.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/bool.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/bool.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/clear.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/clear.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/clear.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/clear.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/eof.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/eof.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/eof.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/eof.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/exceptions.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/exceptions.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/exceptions.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/exceptions.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/exceptions_iostate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/exceptions_iostate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/exceptions_iostate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/exceptions_iostate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/fail.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/fail.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/fail.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/fail.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/good.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/good.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/good.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/good.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/not.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/not.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/not.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/not.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/rdstate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/rdstate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/rdstate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/rdstate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/setstate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/setstate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/iostate.flags/setstate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/iostate.flags/setstate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/ios/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/ios/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/adjustfield.manip/internal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/adjustfield.manip/internal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/adjustfield.manip/internal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/adjustfield.manip/internal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/adjustfield.manip/left.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/adjustfield.manip/left.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/adjustfield.manip/left.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/adjustfield.manip/left.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/adjustfield.manip/right.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/adjustfield.manip/right.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/adjustfield.manip/right.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/adjustfield.manip/right.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/basefield.manip/dec.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/basefield.manip/dec.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/basefield.manip/dec.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/basefield.manip/dec.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/basefield.manip/hex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/basefield.manip/hex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/basefield.manip/hex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/basefield.manip/hex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/basefield.manip/oct.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/basefield.manip/oct.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/basefield.manip/oct.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/basefield.manip/oct.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/error.reporting/iostream_category.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/error.reporting/iostream_category.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/error.reporting/iostream_category.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/error.reporting/iostream_category.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/error.reporting/make_error_code.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/error.reporting/make_error_code.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/error.reporting/make_error_code.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/error.reporting/make_error_code.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/error.reporting/make_error_condition.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/error.reporting/make_error_condition.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/error.reporting/make_error_condition.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/error.reporting/make_error_condition.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/defaultfloat.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/defaultfloat.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/defaultfloat.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/defaultfloat.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/fixed.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/fixed.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/fixed.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/fixed.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/hexfloat.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/hexfloat.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/hexfloat.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/hexfloat.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/scientific.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/scientific.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/scientific.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/floatfield.manip/scientific.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/boolalpha.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/boolalpha.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/boolalpha.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/boolalpha.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noboolalpha.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noboolalpha.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noboolalpha.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noboolalpha.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noshowbase.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noshowbase.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noshowbase.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noshowbase.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noshowpoint.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noshowpoint.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noshowpoint.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noshowpoint.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noshowpos.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noshowpos.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noshowpos.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noshowpos.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noskipws.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noskipws.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noskipws.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/noskipws.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/nounitbuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/nounitbuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/nounitbuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/nounitbuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/nouppercase.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/nouppercase.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/nouppercase.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/nouppercase.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/showbase.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/showbase.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/showbase.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/showbase.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/showpoint.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/showpoint.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/showpoint.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/showpoint.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/showpos.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/showpos.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/showpos.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/showpos.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/skipws.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/skipws.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/skipws.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/skipws.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/unitbuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/unitbuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/unitbuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/unitbuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/uppercase.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/uppercase.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/uppercase.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/fmtflags.manip/uppercase.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/std.ios.manip/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/std.ios.manip/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/stream.types/streamoff.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/stream.types/streamoff.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/stream.types/streamoff.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/stream.types/streamoff.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/stream.types/streamsize.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/stream.types/streamsize.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/stream.types/streamsize.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/stream.types/streamsize.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.base/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.base/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.requirements/iostream.limits.imbue/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.requirements/iostream.limits.imbue/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.requirements/iostream.limits.imbue/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.requirements/iostream.limits.imbue/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.requirements/iostreams.limits.pos/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.requirements/iostreams.limits.pos/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.requirements/iostreams.limits.pos/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.requirements/iostreams.limits.pos/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.requirements/iostreams.threadsafety/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.requirements/iostreams.threadsafety/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.requirements/iostreams.threadsafety/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.requirements/iostreams.threadsafety/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/iostreams.requirements/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.requirements/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/iostreams.requirements/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/iostreams.requirements/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf.reqts/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf.reqts/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf.reqts/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf.reqts/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.cons/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.cons/default.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.cons/default.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.cons/default.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.cons/default.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekoff.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekoff.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekoff.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekoff.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekpos.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekpos.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekpos.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubseekpos.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubsetbuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubsetbuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubsetbuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubsetbuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubsync.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubsync.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubsync.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.buffer/pubsync.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/locales.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/locales.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/locales.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.locales/locales.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/in_avail.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/in_avail.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/in_avail.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/in_avail.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/sbumpc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/sbumpc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/sbumpc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/sbumpc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/sgetc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/sgetc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/sgetc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/sgetc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/sgetn.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/sgetn.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/sgetn.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/sgetn.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/snextc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/snextc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/snextc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.get/snextc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.pback/sputbackc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.pback/sputbackc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.pback/sputbackc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.pback/sputbackc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.pback/sungetc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.pback/sungetc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.pback/sungetc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.pback/sungetc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.put/sputc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.put/sputc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.put/sputc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.put/sputc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.put/sputn.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.put/sputn.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.put/sputn.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.members/streambuf.pub.put/sputn.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.protected/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.protected/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.assign/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.get.area/gbump.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.get.area/gbump.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.get.area/gbump.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.get.area/gbump.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.get.area/setg.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.get.area/setg.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.get.area/setg.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.get.area/setg.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/setp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/setp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/setp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/setp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.buffer/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.buffer/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.buffer/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.buffer/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/showmanyc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/showmanyc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/showmanyc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/showmanyc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/uflow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/uflow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/uflow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/uflow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/underflow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/underflow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/underflow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/underflow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/xsgetn.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/xsgetn.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/xsgetn.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.get/xsgetn.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.locales/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.locales/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.locales/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.locales/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.pback/pbackfail.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.pback/pbackfail.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.pback/pbackfail.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.pback/pbackfail.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/overflow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/overflow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/overflow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/overflow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/xsputn.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/xsputn.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/xsputn.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/streambuf.virtuals/streambuf.virt.put/xsputn.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/streambuf/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/streambuf/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/stream.buffers/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/stream.buffers/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/istringstream/istringstream.assign/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/istringstream/istringstream.assign/member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/istringstream/istringstream.assign/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/istringstream/istringstream.assign/member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/istringstream/istringstream.assign/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/istringstream/istringstream.assign/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/istringstream/istringstream.assign/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/istringstream/istringstream.assign/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/istringstream/istringstream.assign/nonmember_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/istringstream/istringstream.assign/nonmember_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/istringstream/istringstream.assign/nonmember_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/istringstream/istringstream.assign/nonmember_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/istringstream/istringstream.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/istringstream/istringstream.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/istringstream/istringstream.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/istringstream/istringstream.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/istringstream/istringstream.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/istringstream/istringstream.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/istringstream/istringstream.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/istringstream/istringstream.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/istringstream/istringstream.cons/string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/istringstream/istringstream.cons/string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/istringstream/istringstream.cons/string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/istringstream/istringstream.cons/string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/istringstream/istringstream.members/str.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/istringstream/istringstream.members/str.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/istringstream/istringstream.members/str.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/istringstream/istringstream.members/str.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/istringstream/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/istringstream/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/istringstream/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/istringstream/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/ostringstream/ostringstream.assign/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/ostringstream/ostringstream.assign/member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/ostringstream/ostringstream.assign/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/ostringstream/ostringstream.assign/member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/ostringstream/ostringstream.assign/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/ostringstream/ostringstream.assign/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/ostringstream/ostringstream.assign/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/ostringstream/ostringstream.assign/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/ostringstream/ostringstream.assign/nonmember_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/ostringstream/ostringstream.assign/nonmember_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/ostringstream/ostringstream.assign/nonmember_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/ostringstream/ostringstream.assign/nonmember_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/ostringstream/ostringstream.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/ostringstream/ostringstream.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/ostringstream/ostringstream.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/ostringstream/ostringstream.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/ostringstream/ostringstream.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/ostringstream/ostringstream.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/ostringstream/ostringstream.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/ostringstream/ostringstream.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/ostringstream/ostringstream.cons/string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/ostringstream/ostringstream.cons/string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/ostringstream/ostringstream.cons/string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/ostringstream/ostringstream.cons/string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/ostringstream/ostringstream.members/str.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/ostringstream/ostringstream.members/str.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/ostringstream/ostringstream.members/str.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/ostringstream/ostringstream.members/str.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/ostringstream/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/ostringstream/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/ostringstream/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/ostringstream/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.assign/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.assign/member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.assign/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.assign/member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.assign/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.assign/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.assign/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.assign/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.assign/nonmember_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.assign/nonmember_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.assign/nonmember_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.assign/nonmember_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.cons/string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.cons/string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.cons/string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.cons/string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.members/str.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.members/str.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.members/str.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.members/str.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.virtuals/overflow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.virtuals/overflow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.virtuals/overflow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.virtuals/overflow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.virtuals/pbackfail.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.virtuals/pbackfail.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.virtuals/pbackfail.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.virtuals/pbackfail.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.virtuals/seekoff.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.virtuals/seekoff.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.virtuals/seekoff.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.virtuals/seekoff.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.virtuals/seekpos.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.virtuals/seekpos.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.virtuals/seekpos.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.virtuals/seekpos.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.virtuals/setbuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.virtuals/setbuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.virtuals/setbuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.virtuals/setbuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.virtuals/underflow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.virtuals/underflow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/stringbuf.virtuals/underflow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/stringbuf.virtuals/underflow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringbuf/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringbuf/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringstream.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringstream.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringstream.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringstream.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.cons/move2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.cons/move2.pass.cpp
new file mode 100644
index 0000000..856cf3c
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.cons/move2.pass.cpp
@@ -0,0 +1,37 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <sstream>
+
+// template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
+// class basic_stringstream
+
+// basic_stringstream(basic_stringstream&& rhs);
+
+#include <sstream>
+#include <vector>
+#include <string>
+#include <cassert>
+
+int main()
+{
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
+    std::vector<std::istringstream> vecis;
+    vecis.push_back(std::istringstream());
+    vecis.back().str("hub started at [00 6b 8b 45 69]");
+    vecis.push_back(std::istringstream());
+    vecis.back().str("hub started at [00 6b 8b 45 69]");
+    for (int n = 0; n < vecis.size(); n++)
+    {
+        assert(vecis[n].str().size() == 31);
+        vecis[n].seekg(0, std::ios_base::beg);
+        assert(vecis[n].str().size() == 31);
+    }
+#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
+}
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringstream.cons/string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.cons/string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringstream.cons/string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.cons/string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringstream.cons/stringstream.assign/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.cons/stringstream.assign/member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringstream.cons/stringstream.assign/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.cons/stringstream.assign/member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringstream.cons/stringstream.assign/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.cons/stringstream.assign/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringstream.cons/stringstream.assign/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.cons/stringstream.assign/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringstream.cons/stringstream.assign/nonmember_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.cons/stringstream.assign/nonmember_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringstream.cons/stringstream.assign/nonmember_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.cons/stringstream.assign/nonmember_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringstream.members/str.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.members/str.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringstream.members/str.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream.members/str.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringstream/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/stringstream/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/stringstream/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/string.streams/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/input.output/string.streams/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/input.output/string.streams/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.basic/iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.basic/iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.basic/iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.basic/iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.operations/advance.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.operations/distance.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.operations/next.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.operations/next.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.operations/next.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.operations/next.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.operations/prev.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.traits/const_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.traits/const_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.traits/const_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.traits/const_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.traits/empty.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.traits/empty.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.traits/empty.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.traits/empty.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.traits/iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.traits/iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.traits/iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.traits/iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.traits/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.traits/pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/iterator.traits/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/iterator.traits/pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/std.iterator.tags/bidirectional_iterator_tag.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/std.iterator.tags/bidirectional_iterator_tag.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/std.iterator.tags/bidirectional_iterator_tag.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/std.iterator.tags/bidirectional_iterator_tag.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/std.iterator.tags/forward_iterator_tag.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/std.iterator.tags/forward_iterator_tag.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/std.iterator.tags/forward_iterator_tag.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/std.iterator.tags/forward_iterator_tag.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/std.iterator.tags/input_iterator_tag.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/std.iterator.tags/input_iterator_tag.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/std.iterator.tags/input_iterator_tag.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/std.iterator.tags/input_iterator_tag.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/std.iterator.tags/output_iterator_tag.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/std.iterator.tags/output_iterator_tag.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/std.iterator.tags/output_iterator_tag.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/std.iterator.tags/output_iterator_tag.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/std.iterator.tags/random_access_iterator_tag.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/std.iterator.tags/random_access_iterator_tag.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.primitives/std.iterator.tags/random_access_iterator_tag.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.primitives/std.iterator.tags/random_access_iterator_tag.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.requirements/bidirectional.iterators/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.requirements/bidirectional.iterators/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.requirements/bidirectional.iterators/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.requirements/bidirectional.iterators/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.requirements/forward.iterators/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.requirements/forward.iterators/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.requirements/forward.iterators/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.requirements/forward.iterators/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.requirements/input.iterators/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.requirements/input.iterators/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.requirements/input.iterators/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.requirements/input.iterators/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.requirements/iterator.iterators/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.requirements/iterator.iterators/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.requirements/iterator.iterators/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.requirements/iterator.iterators/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.requirements/iterator.requirements.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.requirements/iterator.requirements.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.requirements/iterator.requirements.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.requirements/iterator.requirements.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.requirements/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.requirements/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.requirements/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.requirements/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.requirements/output.iterators/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.requirements/output.iterators/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.requirements/output.iterators/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.requirements/output.iterators/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.requirements/random.access.iterators/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.requirements/random.access.iterators/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.requirements/random.access.iterators/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.requirements/random.access.iterators/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterator.synopsis/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.synopsis/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterator.synopsis/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterator.synopsis/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/iterators.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterators.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/iterators.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/iterators.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/post.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/post.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/post.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/post.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/pre.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/pre.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/pre.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/pre.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op=/lv_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op=/lv_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op=/lv_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op=/lv_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op=/rv_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op=/rv_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op=/rv_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op=/rv_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op_astrk/test.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op_astrk/test.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op_astrk/test.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op_astrk/test.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.inserter/test.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.inserter/test.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.inserter/test.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.inserter/test.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iterator/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iterator/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/back.insert.iterator/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/back.insert.iterator/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/post.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/post.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/post.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/post.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/pre.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/pre.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/pre.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/pre.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/lv_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/lv_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/lv_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/lv_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/rv_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/rv_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/rv_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/rv_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/test.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/test.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/test.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/test.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/test.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/test.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/test.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/test.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iterator/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iterator/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/front.insert.iterator/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/front.insert.iterator/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.cons/test.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.cons/test.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.cons/test.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.cons/test.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/post.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/post.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/post.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/post.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/pre.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/pre.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/pre.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/pre.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/lv_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/lv_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/lv_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/lv_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/rv_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/rv_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/rv_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/rv_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op_astrk/test.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op_astrk/test.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op_astrk/test.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op_astrk/test.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/inserter/test.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/inserter/test.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/inserter/test.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/inserter/test.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iter.ops/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iterator/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iterator/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/insert.iterator/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/insert.iterator/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/insert.iterators/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/insert.iterators/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/minus.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/plus.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+/difference_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.+=/difference_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-/difference_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.-=/difference_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_gte.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_lte.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.comp/op_neq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.conv/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.conv/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.conv/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.conv/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/post.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.decr/pre.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/post.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.incr/pre.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.index/difference_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.ref/op_arrow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.ref/op_arrow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.ref/op_arrow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.ref/op_arrow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.star/op_star.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.star/op_star.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.star/op_star.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.star/op_star.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.ops/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.ops/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.requirements/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.requirements/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iter.requirements/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iter.requirements/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/move.iterators/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/move.iterators/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.conv/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.conv/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.conv/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.conv/tested_elsewhere.pass.cpp
diff --git "a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op\041=/test.pass.cpp" "b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op\041=/test.pass.cpp"
similarity index 100%
rename from "sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op\041=/test.pass.cpp"
rename to "sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op\041=/test.pass.cpp"
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/post.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op++/pre.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+=/difference_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/post.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op--/pre.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-=/difference_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op.star/op_star.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op.star/op_star.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op.star/op_star.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op.star/op_star.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/test.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/test.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/test.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op==/test.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt/test.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opgt=/test.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opindex/difference_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt/test.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.oplt=/test.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opref/op_arrow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opref/op_arrow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opref/op_arrow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opref/op_arrow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opsum/difference_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.requirements/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.requirements/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iter.requirements/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iter.requirements/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/predef.iterators/reverse.iterators/reverse.iterator/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/istream.iterator.cons/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/istream.iterator.cons/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/istream.iterator.cons/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/istream.iterator.cons/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/istream.iterator.cons/istream.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/istream.iterator.cons/istream.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/istream.iterator.cons/istream.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/istream.iterator.cons/istream.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/arrow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/arrow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/arrow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/arrow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/dereference.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/dereference.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/dereference.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/dereference.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/post_increment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/post_increment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/post_increment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/post_increment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/pre_increment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/pre_increment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/pre_increment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/istream.iterator.ops/pre_increment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istream.iterator/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istream.iterator/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/istream.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/istream.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/istream.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/istream.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/proxy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/proxy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/proxy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/proxy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/streambuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/streambuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/streambuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator.cons/streambuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_equal/equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_equal/equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_equal/equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_equal/equal.pass.cpp
diff --git "a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op\041=/not_equal.pass.cpp" "b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op\041=/not_equal.pass.cpp"
similarity index 100%
rename from "sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op\041=/not_equal.pass.cpp"
rename to "sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op\041=/not_equal.pass.cpp"
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op++/dereference.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op++/dereference.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op++/dereference.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op++/dereference.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op==/equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op==/equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op==/equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op==/equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/arrow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/arrow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/arrow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/arrow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/post_increment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/post_increment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/post_increment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/post_increment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/pre_increment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/pre_increment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/pre_increment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_op_astrk/pre_increment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_proxy/proxy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_proxy/proxy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_proxy/proxy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/istreambuf.iterator_proxy/proxy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/istreambuf.iterator/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/istreambuf.iterator/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/iterator.range/begin_array.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/iterator.range/begin_array.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/iterator.range/begin_array.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/iterator.range/begin_array.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/iterator.range/begin_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/iterator.range/begin_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/iterator.range/begin_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/iterator.range/begin_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/iterator.range/begin_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/iterator.range/begin_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/iterator.range/begin_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/iterator.range/begin_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/iterator.range/end_array.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/iterator.range/end_array.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/iterator.range/end_array.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/iterator.range/end_array.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/iterator.range/end_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/iterator.range/end_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/iterator.range/end_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/iterator.range/end_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/iterator.range/end_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/iterator.range/end_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/iterator.range/end_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/iterator.range/end_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/ostream.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/ostream.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/ostream.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/ostream.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/ostream_delem.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/ostream_delem.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/ostream_delem.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.cons.des/ostream_delem.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/assign_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/assign_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/assign_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/assign_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/dereference.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/dereference.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/dereference.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/dereference.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/increment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/increment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/increment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostream.iterator/ostream.iterator.ops/increment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostream.iterator/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostream.iterator/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostream.iterator/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostream.iterator/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.cons/ostream.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.cons/ostream.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.cons/ostream.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.cons/ostream.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.cons/streambuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.cons/streambuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.cons/streambuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.cons/streambuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/assign_c.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/assign_c.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/assign_c.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/assign_c.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/deref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/deref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/deref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/deref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/failed.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/failed.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/failed.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/failed.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/increment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/increment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/increment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostreambuf.iterator/ostreambuf.iter.ops/increment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostreambuf.iterator/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostreambuf.iterator/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/stream.iterators/ostreambuf.iterator/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/stream.iterators/ostreambuf.iterator/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/iterators/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/iterators/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/iterators/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/iterators/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/cstdint/cstdint.syn/cstdint.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/cstdint/cstdint.syn/cstdint.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/cstdint/cstdint.syn/cstdint.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/cstdint/cstdint.syn/cstdint.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/cstdint/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/cstdint/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/cstdint/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/cstdint/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/alloc.errors/bad.alloc/bad_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/alloc.errors/bad.alloc/bad_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/alloc.errors/bad.alloc/bad_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/alloc.errors/bad.alloc/bad_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_new_length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_new_length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_new_length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/alloc.errors/new.badlength/bad_array_new_length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/alloc.errors/new.handler/new_handler.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/alloc.errors/new.handler/new_handler.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/alloc.errors/new.handler/new_handler.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/alloc.errors/new.handler/new_handler.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/alloc.errors/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/alloc.errors/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/alloc.errors/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/alloc.errors/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/alloc.errors/set.new.handler/get_new_handler.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/alloc.errors/set.new.handler/get_new_handler.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/alloc.errors/set.new.handler/get_new_handler.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/alloc.errors/set.new.handler/get_new_handler.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/alloc.errors/set.new.handler/set_new_handler.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/alloc.errors/set.new.handler/set_new_handler.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/alloc.errors/set.new.handler/set_new_handler.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/alloc.errors/set.new.handler/set_new_handler.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.dataraces/not_testable.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.dataraces/not_testable.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.dataraces/not_testable.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.dataraces/not_testable.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.placement/new.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.placement/new.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.placement/new.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.placement/new.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.placement/new_array.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.placement/new_array.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.placement/new_array.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.placement/new_array.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/new.delete/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/new.delete/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.dynamic/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.dynamic/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/bad.exception/bad_exception.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/bad.exception/bad_exception.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/bad.exception/bad_exception.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/bad.exception/bad_exception.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/except.nested/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/except.nested/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/except.nested/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/except.nested/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/except.nested/ctor_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/except.nested/ctor_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/except.nested/ctor_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/except.nested/ctor_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/except.nested/ctor_default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/except.nested/ctor_default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/except.nested/ctor_default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/except.nested/ctor_default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/except.nested/rethrow_if_nested.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/except.nested/rethrow_if_nested.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/except.nested/rethrow_if_nested.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/except.nested/rethrow_if_nested.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/except.nested/rethrow_nested.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/except.nested/rethrow_nested.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/except.nested/rethrow_nested.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/except.nested/rethrow_nested.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/except.nested/throw_with_nested.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/except.nested/throw_with_nested.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/except.nested/throw_with_nested.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/except.nested/throw_with_nested.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/exception.terminate/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/exception.terminate/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/exception.terminate/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/exception.terminate/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/exception.terminate/set.terminate/get_terminate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/exception.terminate/set.terminate/get_terminate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/exception.terminate/set.terminate/get_terminate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/exception.terminate/set.terminate/get_terminate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/exception.terminate/set.terminate/set_terminate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/exception.terminate/set.terminate/set_terminate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/exception.terminate/set.terminate/set_terminate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/exception.terminate/set.terminate/set_terminate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/exception.terminate/terminate.handler/terminate_handler.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/exception.terminate/terminate.handler/terminate_handler.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/exception.terminate/terminate.handler/terminate_handler.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/exception.terminate/terminate.handler/terminate_handler.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/exception.terminate/terminate/terminate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/exception.terminate/terminate/terminate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/exception.terminate/terminate/terminate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/exception.terminate/terminate/terminate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/exception/exception.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/exception/exception.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/exception/exception.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/exception/exception.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/propagation/current_exception.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/propagation/current_exception.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/propagation/current_exception.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/propagation/current_exception.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/propagation/exception_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/propagation/exception_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/propagation/exception_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/propagation/exception_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/propagation/make_exception_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/propagation/make_exception_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/propagation/make_exception_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/propagation/make_exception_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/propagation/rethrow_exception.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/propagation/rethrow_exception.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/propagation/rethrow_exception.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/propagation/rethrow_exception.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/uncaught/uncaught_exception.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/uncaught/uncaught_exception.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/uncaught/uncaught_exception.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/uncaught/uncaught_exception.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.exception/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.exception/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.exception/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.initlist/support.initlist.access/access.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.initlist/support.initlist.access/access.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.initlist/support.initlist.access/access.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.initlist/support.initlist.access/access.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.initlist/support.initlist.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.initlist/support.initlist.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.initlist/support.initlist.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.initlist/support.initlist.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.initlist/support.initlist.range/begin_end.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.initlist/support.initlist.range/begin_end.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.initlist/support.initlist.range/begin_end.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.initlist/support.initlist.range/begin_end.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.initlist/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.initlist/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.initlist/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.initlist/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.initlist/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.initlist/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.initlist/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.initlist/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/c.limits/cfloat.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/c.limits/cfloat.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/c.limits/cfloat.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/c.limits/cfloat.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/c.limits/climits.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/c.limits/climits.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/c.limits/climits.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/c.limits/climits.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/c.limits/version_cfloat.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/c.limits/version_cfloat.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/c.limits/version_cfloat.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/c.limits/version_cfloat.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/c.limits/version_climits.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/c.limits/version_climits.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/c.limits/version_climits.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/c.limits/version_climits.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/denorm.style/check_values.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/denorm.style/check_values.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/denorm.style/check_values.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/denorm.style/check_values.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/is_specialized.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/is_specialized.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/is_specialized.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/is_specialized.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/const_data_members.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/const_data_members.pass.cpp
old mode 100644
new mode 100755
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/const_data_members.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/const_data_members.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/denorm_min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/digits10.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/epsilon.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_denorm.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_denorm_loss.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_infinity.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_quiet_NaN.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/has_signaling_NaN.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/infinity.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_bounded.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_exact.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_integer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_modulo.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/is_signed.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/lowest.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_digits10.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_exponent.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/max_exponent10.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min_exponent.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/min_exponent10.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/quiet_NaN.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/radix.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/round_error.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/round_style.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/signaling_NaN.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/tinyness_before.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits.members/traps.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.limits/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.limits/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.special/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.special/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/numeric.special/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/numeric.special/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/round.style/check_values.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/round.style/check_values.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/round.style/check_values.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/round.style/check_values.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/limits/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/limits/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.limits/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.limits/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.limits/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.rtti/bad.cast/bad_cast.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.rtti/bad.cast/bad_cast.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.rtti/bad.cast/bad_cast.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.rtti/bad.cast/bad_cast.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.rtti/bad.typeid/bad_typeid.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.rtti/bad.typeid/bad_typeid.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.rtti/bad.typeid/bad_typeid.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.rtti/bad.typeid/bad_typeid.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.rtti/type.info/type_info.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.rtti/type.info/type_info.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.rtti/type.info/type_info.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.rtti/type.info/type_info.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.rtti/type.info/type_info_hash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.rtti/type.info/type_info_hash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.rtti/type.info/type_info_hash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.rtti/type.info/type_info_hash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.rtti/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.rtti/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.rtti/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.rtti/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/csetjmp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/csetjmp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/csetjmp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/csetjmp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/csignal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/csignal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/csignal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/csignal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/cstdarg.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/cstdarg.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/cstdarg.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/cstdarg.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/cstdbool.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/cstdbool.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/cstdbool.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/cstdbool.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/cstdlib.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/cstdlib.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/cstdlib.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/cstdlib.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/ctime.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/ctime.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/ctime.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/ctime.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/version_csetjmp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/version_csetjmp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/version_csetjmp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/version_csetjmp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/version_csignal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/version_csignal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/version_csignal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/version_csignal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/version_cstdarg.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/version_cstdarg.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/version_cstdarg.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/version_cstdarg.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/version_cstdbool.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/version_cstdbool.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/version_cstdbool.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/version_cstdbool.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/version_cstdlib.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/version_cstdlib.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/version_cstdlib.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/version_cstdlib.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/version_ctime.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/version_ctime.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.runtime/version_ctime.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.runtime/version_ctime.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.start.term/quick_exit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.start.term/quick_exit.pass.cpp
similarity index 94%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.start.term/quick_exit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.start.term/quick_exit.pass.cpp
index 5c732b3..1945a1b 100644
--- a/sources/cxx-stl/llvm-libc++/test/language.support/support.start.term/quick_exit.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.start.term/quick_exit.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: apple-darwin
 
 // test quick_exit and at_quick_exit
 
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.types/max_align_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.types/max_align_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.types/max_align_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.types/max_align_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.types/null.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.types/null.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.types/null.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.types/null.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.types/nullptr_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.types/nullptr_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.types/nullptr_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.types/nullptr_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.types/offsetof.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.types/offsetof.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.types/offsetof.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.types/offsetof.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.types/ptrdiff_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.types/ptrdiff_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.types/ptrdiff_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.types/ptrdiff_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.types/size_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.types/size_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.types/size_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.types/size_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/language.support/support.types/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.types/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/language.support/support.types/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/language.support/support.types/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/lit.cfg b/sources/cxx-stl/llvm-libc++/libcxx/test/lit.cfg
new file mode 100644
index 0000000..1a28e4e
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/lit.cfg
@@ -0,0 +1,319 @@
+# -*- Python -*- vim: set syntax=python tabstop=4 expandtab cc=80:
+
+# Configuration file for the 'lit' test runner.
+
+import os
+import sys
+import platform
+import tempfile
+import signal
+import subprocess
+import errno
+import time
+import shlex
+
+# FIXME: For now, this is cribbed from lit.TestRunner, to avoid introducing a
+# dependency there. What we more ideally would like to do is lift the "xfail"
+# and "requires" handling to be a core lit framework feature.
+def isExpectedFail(test, xfails):
+    # Check if any of the xfails match an available feature or the target.
+    for item in xfails:
+        # If this is the wildcard, it always fails.
+        if item == '*':
+            return True
+
+        # If this is a part of any of the features, it fails.
+        for feature in test.config.available_features:
+            if item in feature:
+                return True
+
+        # If this is a part of the target triple, it fails.
+        if item in test.suite.config.target_triple:
+            return True
+
+    return False
+
+class LibcxxTestFormat(lit.formats.FileBasedTest):
+    """
+    Custom test format handler for use with the test format use by libc++.
+
+    Tests fall into two categories:
+      FOO.pass.cpp - Executable test which should compile, run, and exit with
+                     code 0.
+      FOO.fail.cpp - Negative test case which is expected to fail compilation.
+    """
+
+    def __init__(self, cxx_under_test, cpp_flags, ld_flags, exec_env):
+        self.cxx_under_test = cxx_under_test
+        self.cpp_flags = list(cpp_flags)
+        self.ld_flags = list(ld_flags)
+        self.exec_env = dict(exec_env)
+
+    def execute_command(self, command, in_dir=None):
+        kwargs = {
+            'stdin' :subprocess.PIPE,
+            'stdout':subprocess.PIPE,
+            'stderr':subprocess.PIPE,
+        }
+        if in_dir:
+            kwargs['cwd'] = in_dir
+        p = subprocess.Popen(command, **kwargs)
+        out,err = p.communicate()
+        exitCode = p.wait()
+
+        # Detect Ctrl-C in subprocess.
+        if exitCode == -signal.SIGINT:
+            raise KeyboardInterrupt
+
+        return out, err, exitCode
+
+    def execute(self, test, lit_config):
+        while True:
+            try:
+                return self._execute(test, lit_config)
+            except OSError, oe:
+                if oe.errno != errno.ETXTBSY:
+                    raise
+                time.sleep(0.1)
+
+    def _execute(self, test, lit_config):
+        # Extract test metadata from the test file.
+        xfails = []
+        requires = []
+        with open(test.getSourcePath()) as f:
+            for ln in f:
+                if 'XFAIL:' in ln:
+                    items = ln[ln.index('XFAIL:') + 6:].split(',')
+                    xfails.extend([s.strip() for s in items])
+                elif 'REQUIRES:' in ln:
+                    items = ln[ln.index('REQUIRES:') + 9:].split(',')
+                    requires.extend([s.strip() for s in items])
+                elif not ln.startswith("//") and ln.strip():
+                    # Stop at the first non-empty line that is not a C++
+                    # comment.
+                    break
+
+        # Check that we have the required features.
+        #
+        # FIXME: For now, this is cribbed from lit.TestRunner, to avoid
+        # introducing a dependency there. What we more ideally would like to do
+        # is lift the "xfail" and "requires" handling to be a core lit
+        # framework feature.
+        missing_required_features = [f for f in requires
+                                     if f not in test.config.available_features]
+        if missing_required_features:
+            return (lit.Test.UNSUPPORTED,
+                    "Test requires the following features: %s" % (
+                      ', '.join(missing_required_features),))
+
+        # Determine if this test is an expected failure.
+        isXFail = isExpectedFail(test, xfails)
+
+        # Evaluate the test.
+        result, report = self._evaluate_test(test, lit_config)
+
+        # Convert the test result based on whether this is an expected failure.
+        if isXFail:
+            if result != lit.Test.FAIL:
+                report += "\n\nTest was expected to FAIL, but did not.\n"
+                result = lit.Test.XPASS
+            else:
+                result = lit.Test.XFAIL
+
+        return result, report
+
+    def _evaluate_test(self, test, lit_config):
+        name = test.path_in_suite[-1]
+        source_path = test.getSourcePath()
+        source_dir = os.path.dirname(source_path)
+
+        # Check what kind of test this is.
+        assert name.endswith('.pass.cpp') or name.endswith('.fail.cpp')
+        expected_compile_fail = name.endswith('.fail.cpp')
+
+        # If this is a compile (failure) test, build it and check for failure.
+        if expected_compile_fail:
+            cmd = [self.cxx_under_test, '-c',
+                   '-o', '/dev/null', source_path] + self.cpp_flags
+            out, err, exitCode = self.execute_command(cmd)
+            if exitCode == 1:
+                return lit.Test.PASS, ""
+            else:
+                report = """Command: %s\n""" % ' '.join(["'%s'" % a
+                                                         for a in cmd])
+                report += """Exit Code: %d\n""" % exitCode
+                if out:
+                    report += """Standard Output:\n--\n%s--""" % out
+                if err:
+                    report += """Standard Error:\n--\n%s--""" % err
+                report += "\n\nExpected compilation to fail!"
+                return lit.Test.FAIL, report
+        else:
+            exec_file = tempfile.NamedTemporaryFile(suffix="exe", delete=False)
+            exec_path = exec_file.name
+            exec_file.close()
+
+            try:
+                compile_cmd = [self.cxx_under_test, '-o', exec_path,
+                       source_path] + self.cpp_flags + self.ld_flags
+                cmd = compile_cmd
+                out, err, exitCode = self.execute_command(cmd)
+                if exitCode != 0:
+                    report = """Command: %s\n""" % ' '.join(["'%s'" % a
+                                                             for a in cmd])
+                    report += """Exit Code: %d\n""" % exitCode
+                    if out:
+                        report += """Standard Output:\n--\n%s--""" % out
+                    if err:
+                        report += """Standard Error:\n--\n%s--""" % err
+                    report += "\n\nCompilation failed unexpectedly!"
+                    return lit.Test.FAIL, report
+
+                cmd = []
+                if self.exec_env:
+                    cmd.append('env')
+                    cmd.extend('%s=%s' % (name, value)
+                               for name,value in self.exec_env.items())
+                cmd.append(exec_path)
+                if lit_config.useValgrind:
+                    cmd = lit_config.valgrindArgs + cmd
+                out, err, exitCode = self.execute_command(cmd, source_dir)
+                if exitCode != 0:
+                    report = """Compiled With: %s\n""" % \
+                        ' '.join(["'%s'" % a for a in compile_cmd])
+                    report += """Command: %s\n""" % \
+                        ' '.join(["'%s'" % a for a in cmd])
+                    report += """Exit Code: %d\n""" % exitCode
+                    if out:
+                        report += """Standard Output:\n--\n%s--""" % out
+                    if err:
+                        report += """Standard Error:\n--\n%s--""" % err
+                    report += "\n\nCompiled test failed unexpectedly!"
+                    return lit.Test.FAIL, report
+            finally:
+                try:
+                    os.remove(exec_path)
+                except:
+                    pass
+        return lit.Test.PASS, ""
+
+# name: The name of this test suite.
+config.name = 'libc++'
+
+# suffixes: A list of file extensions to treat as test files.
+config.suffixes = ['.cpp']
+
+# test_source_root: The root path where tests are located.
+config.test_source_root = os.path.dirname(__file__)
+
+# Gather various compiler parameters.
+cxx_under_test = lit.params.get('cxx_under_test', None)
+if cxx_under_test is None:
+    cxx_under_test = getattr(config, 'cxx_under_test', None)
+
+    # If no specific cxx_under_test was given, attempt to infer it as clang++.
+    clangxx = lit.util.which('clang++', config.environment['PATH'])
+    if clangxx is not None:
+        cxx_under_test = clangxx
+        lit.note("inferred cxx_under_test as: %r" % (cxx_under_test,))
+if cxx_under_test is None:
+    lit.fatal('must specify user parameter cxx_under_test '
+              '(e.g., --param=cxx_under_test=clang++)')
+
+libcxx_src_root = lit.params.get('libcxx_src_root', None)
+if libcxx_src_root is None:
+    libcxx_src_root = getattr(config, 'libcxx_src_root', None)
+    if libcxx_src_root is None:
+        libcxx_src_root = os.path.dirname(config.test_source_root)
+
+libcxx_obj_root = lit.params.get('libcxx_obj_root', None)
+if libcxx_obj_root is None:
+    libcxx_obj_root = getattr(config, 'libcxx_obj_root', None)
+    if libcxx_obj_root is None:
+        libcxx_obj_root = libcxx_src_root
+
+cxx_has_stdcxx0x_flag_str = lit.params.get('cxx_has_stdcxx0x_flag', None)
+if cxx_has_stdcxx0x_flag_str is not None:
+    if cxx_has_stdcxx0x_flag_str.lower() in ('1', 'true'):
+        cxx_has_stdcxx0x_flag = True
+    elif cxx_has_stdcxx0x_flag_str.lower() in ('', '0', 'false'):
+        cxx_has_stdcxx0x_flag = False
+    else:
+        lit.fatal('user parameter cxx_has_stdcxx0x_flag_str should be 0 or 1')
+else:
+    cxx_has_stdcxx0x_flag = getattr(config, 'cxx_has_stdcxx0x_flag', True)
+
+# This test suite supports testing against either the system library or the
+# locally built one; the former mode is useful for testing ABI compatibility
+# between the current headers and a shipping dynamic library.
+use_system_lib_str = lit.params.get('use_system_lib', None)
+if use_system_lib_str is not None:
+    if use_system_lib_str.lower() in ('1', 'true'):
+        use_system_lib = True
+    elif use_system_lib_str.lower() in ('', '0', 'false'):
+        use_system_lib = False
+    else:
+        lit.fatal('user parameter use_system_lib should be 0 or 1')
+else:
+    # Default to testing against the locally built libc++ library.
+    use_system_lib = False
+    lit.note("inferred use_system_lib as: %r" % (use_system_lib,))
+
+link_flags = []
+link_flags_str = lit.params.get('link_flags', None)
+if link_flags_str is None:
+    link_flags_str = getattr(config, 'link_flags', None)
+    if link_flags_str is None:
+        if sys.platform == 'darwin':
+            link_flags += ['-lSystem']
+        elif sys.platform == 'linux2':
+            link_flags += ['-lsupc++', '-lgcc_eh', '-lc', '-lm', '-lpthread',
+                '-lrt', '-lgcc_s']
+        else:
+            lit.fatal("unrecognized system")
+        lit.note("inferred link_flags as: %r" % (link_flags,))
+if not link_flags_str is None:
+    link_flags += shlex.split(link_flags_str)
+
+# Configure extra compiler flags.
+include_paths = ['-I' + libcxx_src_root + '/include',
+    '-I' + libcxx_src_root + '/test/support']
+library_paths = ['-L' + libcxx_obj_root + '/lib']
+compile_flags = []
+if cxx_has_stdcxx0x_flag:
+    compile_flags += ['-std=c++0x']
+
+# Configure extra linker parameters.
+exec_env = {}
+if sys.platform == 'darwin':
+    if not use_system_lib:
+        exec_env['DYLD_LIBRARY_PATH'] = os.path.join(libcxx_obj_root, 'lib')
+elif sys.platform == 'linux2':
+    if not use_system_lib:
+        link_flags += ['-Wl,-R', libcxx_obj_root + '/lib']
+    compile_flags += ['-D__STDC_FORMAT_MACROS', '-D__STDC_LIMIT_MACROS',
+        '-D__STDC_CONSTANT_MACROS']
+else:
+    lit.fatal("unrecognized system")
+
+config.test_format = LibcxxTestFormat(
+    cxx_under_test,
+    cpp_flags = ['-nostdinc++'] + compile_flags + include_paths,
+    ld_flags = ['-nodefaultlibs'] + library_paths + ['-lc++'] + link_flags,
+    exec_env = exec_env)
+
+# Get or infer the target triple.
+config.target_triple = lit.params.get('target_triple', None)
+# If no target triple was given, try to infer it from the compiler under test.
+if config.target_triple is None:
+    config.target_triple = lit.util.capture(
+        [cxx_under_test, '-dumpmachine']).strip()
+    lit.note("inferred target_triple as: %r" % (config.target_triple,))
+
+# Write an "available feature" that combines the triple when use_system_lib is
+# enabled. This is so that we can easily write XFAIL markers for tests that are
+# known to fail with versions of libc++ as were shipped with a particular
+# triple.
+if use_system_lib:
+    config.available_features.add('with_system_lib=%s' % (
+            config.target_triple,))
diff --git a/sources/cxx-stl/llvm-libc++/test/lit.site.cfg.in b/sources/cxx-stl/llvm-libc++/libcxx/test/lit.site.cfg.in
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/lit.site.cfg.in
rename to sources/cxx-stl/llvm-libc++/libcxx/test/lit.site.cfg.in
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/c.locales/clocale.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/c.locales/clocale.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/c.locales/clocale.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/c.locales/clocale.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/c.locales/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/c.locales/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/c.locales/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/c.locales/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/__scan_keyword.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/__scan_keyword.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/__scan_keyword.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/__scan_keyword.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/hash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate.byname/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate/ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate/ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate/ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate/ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate/locale.collate.members/compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate/locale.collate.members/compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate/locale.collate.members/compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate/locale.collate.members/compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate/locale.collate.members/hash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate/locale.collate.members/hash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate/locale.collate.members/hash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate/locale.collate.members/hash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate/locale.collate.members/transform.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate/locale.collate.members/transform.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate/locale.collate.members/transform.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate/locale.collate.members/transform.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate/locale.collate.virtuals/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate/locale.collate.virtuals/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate/locale.collate.virtuals/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate/locale.collate.virtuals/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/locale.collate/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/locale.collate/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.collate/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.collate/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/ctype_base.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/ctype_base.pass.cpp
similarity index 91%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/ctype_base.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/ctype_base.pass.cpp
index 497eaa3..d78df20 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/ctype_base.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/ctype_base.pass.cpp
@@ -6,6 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This test uses new symbols that were not defined in the libc++ shipped on
+// darwin11 and darwin12:
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <locale>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/dtor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/dtor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/dtor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/dtor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/is_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/is_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/is_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/is_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/is_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/is_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/is_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/is_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/narrow_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/narrow_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/narrow_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/narrow_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/narrow_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/narrow_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/narrow_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/narrow_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/scan_is.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/scan_is.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/scan_is.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/scan_is.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/scan_not.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/scan_not.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/scan_not.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/scan_not.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/table.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/table.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/table.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/table.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/tolower_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/tolower_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/tolower_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/tolower_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/tolower_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/tolower_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/tolower_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/tolower_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/toupper_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/toupper_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/toupper_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/toupper_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/toupper_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/toupper_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/toupper_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/toupper_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/widen_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/widen_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/widen_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/widen_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/widen_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/widen_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/widen_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.members/widen_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.statics/classic_table.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.statics/classic_table.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.statics/classic_table.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.statics/classic_table.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.virtuals/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.virtuals/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.virtuals/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.virtuals/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/facet.ctype.special/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/facet.ctype.special/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char16_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char16_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char16_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char16_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char32_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char32_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char32_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char32_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_wchar_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/codecvt_base.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/codecvt_base.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/codecvt_base.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/codecvt_base.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/ctor_char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/ctor_char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/ctor_char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/ctor_char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/ctor_char16_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/ctor_char16_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/ctor_char16_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/ctor_char16_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/ctor_char32_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/ctor_char32_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/ctor_char32_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/ctor_char32_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/ctor_wchar_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/ctor_wchar_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/ctor_wchar_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/ctor_wchar_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_always_noconv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_always_noconv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_always_noconv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_always_noconv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_encoding.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_encoding.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_encoding.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_encoding.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_in.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_in.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_in.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_in.pass.cpp
index 88382a1..331f4ba 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_in.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_in.pass.cpp
@@ -28,7 +28,7 @@
     const char from[] = "some text";
     F::intern_type to[9];
     const F& f = std::use_facet<F>(l);
-    std::mbstate_t mbs;
+    std::mbstate_t mbs = {0};
     const char* from_next = 0;
     F::intern_type* to_next = 0;
     assert(f.in(mbs, from, from + 9, from_next,
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_length.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_length.pass.cpp
index 7cd4418..34ab217 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_length.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_length.pass.cpp
@@ -22,7 +22,7 @@
 {
     std::locale l = std::locale::classic();
     const F& f = std::use_facet<F>(l);
-    std::mbstate_t mbs;
+    std::mbstate_t mbs = {0};
     const char from[] = "some text";
     assert(f.length(mbs, from, from+10, 0) == 0);
     assert(f.length(mbs, from, from+10, 8) == 8);
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_max_length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_max_length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_max_length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_max_length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_out.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_out.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_out.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_out.pass.cpp
index c06f6d5..0f65f13 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_out.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_out.pass.cpp
@@ -31,7 +31,7 @@
     {
         F::intern_type from[9] = {'s', 'o', 'm', 'e', ' ', 't', 'e', 'x', 't'};
         char to[9] = {0};
-        std::mbstate_t mbs;
+        std::mbstate_t mbs = {0};
         const F::intern_type* from_next = 0;
         char* to_next = 0;
         F::result r = f.out(mbs, from, from + 9, from_next,
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_unshift.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_unshift.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_unshift.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_unshift.pass.cpp
index 36ad6a4..c213030 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_unshift.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_unshift.pass.cpp
@@ -26,7 +26,7 @@
     std::locale l = std::locale::classic();
     std::vector<char> to(3);
     const F& f = std::use_facet<F>(l);
-    std::mbstate_t mbs;
+    std::mbstate_t mbs = {0};
     char* to_next = 0;
     assert(f.unshift(mbs, to.data(), to.data() + to.size(), to_next) == F::noconv);
     assert(to_next == to.data());
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_always_noconv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_always_noconv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_always_noconv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_always_noconv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_encoding.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_encoding.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_encoding.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_encoding.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_in.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_in.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_in.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_in.pass.cpp
index 9430a8a..8fb28f0 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_in.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_in.pass.cpp
@@ -28,7 +28,7 @@
     const char from[] = "some text";
     F::intern_type to[9];
     const F& f = std::use_facet<F>(l);
-    std::mbstate_t mbs;
+    std::mbstate_t mbs = {0};
     const char* from_next = 0;
     F::intern_type* to_next = 0;
     assert(f.in(mbs, from, from + 9, from_next,
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_length.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_length.pass.cpp
index fd3b2bb..d8555d1 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_length.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_length.pass.cpp
@@ -22,7 +22,7 @@
 {
     std::locale l = std::locale::classic();
     const F& f = std::use_facet<F>(l);
-    std::mbstate_t mbs;
+    std::mbstate_t mbs = {0};
     const char from[] = "some text";
     assert(f.length(mbs, from, from+10, 0) == 0);
     assert(f.length(mbs, from, from+10, 8) == 8);
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_max_length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_max_length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_max_length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_max_length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_out.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_out.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_out.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_out.pass.cpp
index 3f06d80..a1d11f7 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_out.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_out.pass.cpp
@@ -31,7 +31,7 @@
     {
         F::intern_type from[9] = {'s', 'o', 'm', 'e', ' ', 't', 'e', 'x', 't'};
         char to[9] = {0};
-        std::mbstate_t mbs;
+        std::mbstate_t mbs = {0};
         const F::intern_type* from_next = 0;
         char* to_next = 0;
         F::result r = f.out(mbs, from, from + 9, from_next,
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_unshift.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_unshift.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_unshift.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_unshift.pass.cpp
index 90266b4..1bd45e0 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_unshift.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_unshift.pass.cpp
@@ -26,7 +26,7 @@
     std::locale l = std::locale::classic();
     std::vector<char> to(3);
     const F& f = std::use_facet<F>(l);
-    std::mbstate_t mbs;
+    std::mbstate_t mbs = {0};
     char* to_next = 0;
     assert(f.unshift(mbs, to.data(), to.data() + to.size(), to_next) == F::noconv);
     assert(to_next == to.data());
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_always_noconv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_always_noconv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_always_noconv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_always_noconv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_encoding.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_encoding.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_encoding.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_encoding.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_in.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_in.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_in.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_in.pass.cpp
index 4fe55c1..4d2f6f2 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_in.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_in.pass.cpp
@@ -28,7 +28,7 @@
     const std::basic_string<F::intern_type> from("some text");
     std::vector<char> to(from.size());
     const F& f = std::use_facet<F>(l);
-    std::mbstate_t mbs;
+    std::mbstate_t mbs = {0};
     const char* from_next = 0;
     char* to_next = 0;
     assert(f.in(mbs, from.data(), from.data() + from.size(), from_next,
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_length.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_length.pass.cpp
index 77ce3b7..df33b18 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_length.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_length.pass.cpp
@@ -22,7 +22,7 @@
 {
     std::locale l = std::locale::classic();
     const F& f = std::use_facet<F>(l);
-    std::mbstate_t mbs;
+    std::mbstate_t mbs = {0};
     const char from[10]= {0};
     assert(f.length(mbs, from, from+10, 0) == 0);
     assert(f.length(mbs, from, from+10, 9) == 9);
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_max_length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_max_length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_max_length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_max_length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_out.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_out.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_out.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_out.pass.cpp
index 2ab3642..de7f024 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_out.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_out.pass.cpp
@@ -28,7 +28,7 @@
     const std::basic_string<F::intern_type> from("some text");
     std::vector<char> to(from.size());
     const F& f = std::use_facet<F>(l);
-    std::mbstate_t mbs;
+    std::mbstate_t mbs = {0};
     const char* from_next = 0;
     char* to_next = 0;
     assert(f.out(mbs, from.data(), from.data() + from.size(), from_next,
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_unshift.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_unshift.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_unshift.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_unshift.pass.cpp
index 6a95c22..830bc43 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_unshift.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char_unshift.pass.cpp
@@ -26,7 +26,7 @@
     std::locale l = std::locale::classic();
     std::vector<char> to(3);
     const F& f = std::use_facet<F>(l);
-    std::mbstate_t mbs;
+    std::mbstate_t mbs = {0};
     char* to_next = 0;
     assert(f.unshift(mbs, to.data(), to.data() + to.size(), to_next) == F::noconv);
     assert(to_next == to.data());
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/utf_sanity_check.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/utf_sanity_check.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/utf_sanity_check.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/utf_sanity_check.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_always_noconv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_always_noconv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_always_noconv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_always_noconv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_encoding.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_encoding.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_encoding.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_encoding.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_in.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_in.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_in.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_in.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_max_length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_max_length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_max_length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_max_length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_out.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_out.pass.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_out.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_out.pass.cpp
index 5d0997c..dce2d38 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_out.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_out.pass.cpp
@@ -29,7 +29,7 @@
     {
         const std::basic_string<F::intern_type> from(L"some text");
         std::vector<char> to(from.size()+1);
-        std::mbstate_t mbs;
+        std::mbstate_t mbs = {0};
         const F::intern_type* from_next = 0;
         char* to_next = 0;
         F::result r = f.out(mbs, from.data(), from.data() + from.size(), from_next,
@@ -43,7 +43,7 @@
         std::basic_string<F::intern_type> from(L"some text");
         from[4] = '\0';
         std::vector<char> to(from.size()+1);
-        std::mbstate_t mbs;
+        std::mbstate_t mbs = {0};
         const F::intern_type* from_next = 0;
         char* to_next = 0;
         F::result r = f.out(mbs, from.data(), from.data() + from.size(), from_next,
@@ -56,7 +56,7 @@
     {
         std::basic_string<F::intern_type> from(L"some text");
         std::vector<char> to(from.size()-1);
-        std::mbstate_t mbs;
+        std::mbstate_t mbs = {0};
         const F::intern_type* from_next = 0;
         char* to_next = 0;
         F::result r = f.out(mbs, from.data(), from.data() + from.size(), from_next,
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_unshift.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_unshift.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_unshift.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/wchar_t_unshift.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.virtuals/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.virtuals/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.virtuals/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.virtuals/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/types_char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/types_char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/types_char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/types_char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/types_char16_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/types_char16_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/types_char16_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/types_char16_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/types_char32_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/types_char32_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/types_char32_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/types_char32_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/types_wchar_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/types_wchar_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.codecvt/types_wchar_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.codecvt/types_wchar_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/narrow_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype.byname/widen_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/is_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/is_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/is_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/is_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/is_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/is_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/is_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/is_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/narrow_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/narrow_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/narrow_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/narrow_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/narrow_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/narrow_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/narrow_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/narrow_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/scan_is.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/scan_is.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/scan_is.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/scan_is.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/scan_not.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/scan_not.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/scan_not.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/scan_not.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/tolower_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/tolower_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/tolower_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/tolower_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/tolower_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/tolower_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/tolower_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/tolower_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/toupper_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/toupper_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/toupper_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/toupper_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/toupper_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/toupper_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/toupper_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/toupper_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/widen_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/widen_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/widen_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/widen_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/widen_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/widen_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/widen_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.members/widen_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.virtuals/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.virtuals/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.virtuals/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/locale.ctype.virtuals/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.ctype/locale.ctype/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.ctype/locale.ctype/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.messages/locale.messages.byname/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.messages/locale.messages.byname/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.messages/locale.messages.byname/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.messages/locale.messages.byname/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.messages/locale.messages/ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.messages/locale.messages/ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.messages/locale.messages/ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.messages/locale.messages/ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.messages/locale.messages/locale.messages.members/not_testable.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.messages/locale.messages/locale.messages.members/not_testable.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.messages/locale.messages/locale.messages.members/not_testable.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.messages/locale.messages/locale.messages.members/not_testable.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.messages/locale.messages/locale.messages.virtuals/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.messages/locale.messages/locale.messages.virtuals/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.messages/locale.messages/locale.messages.virtuals/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.messages/locale.messages/locale.messages.virtuals/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.messages/locale.messages/messages_base.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.messages/locale.messages/messages_base.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.messages/locale.messages/messages_base.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.messages/locale.messages/messages_base.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.messages/locale.messages/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.messages/locale.messages/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.messages/locale.messages/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.messages/locale.messages/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.messages/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.messages/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.messages/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.messages/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
index 2800b49..489068c 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: apple-darwin
 
 // <locale>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
index 82e4747..737299a 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_ru_RU.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: apple-darwin
 
 // <locale>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.virtuals/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.virtuals/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.virtuals/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.virtuals/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.get/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.get/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp
index f7ca56b..73b8f01 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: apple-darwin
 
 // <locale>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
index 07481de..705ed54 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: apple-darwin
 
 // <locale>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.virtuals/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.virtuals/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.virtuals/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.virtuals/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.money.put/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.money.put/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp
index 33ffe54..a197a18 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: apple-darwin
 
 // <locale>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/decimal_point.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/decimal_point.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/decimal_point.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/decimal_point.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/frac_digits.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/frac_digits.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/frac_digits.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/frac_digits.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp
similarity index 98%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp
index 1c14037..5c0bd3d 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: apple-darwin
 
 // <locale>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp
index 0ab2957..e670354 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: apple-darwin
 
 // <locale>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/negative_sign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/negative_sign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/negative_sign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/negative_sign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format.pass.cpp
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format.pass.cpp
index d9ea4a4..3027737 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: apple-darwin
 
 // <locale>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/positive_sign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/positive_sign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/positive_sign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/positive_sign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/thousands_sep.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/thousands_sep.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/thousands_sep.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct.byname/thousands_sep.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/curr_symbol.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/curr_symbol.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/curr_symbol.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/curr_symbol.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/decimal_point.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/decimal_point.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/decimal_point.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/decimal_point.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/frac_digits.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/frac_digits.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/frac_digits.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/frac_digits.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/grouping.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/grouping.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/grouping.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/grouping.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/neg_format.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/neg_format.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/neg_format.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/neg_format.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/negative_sign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/negative_sign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/negative_sign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/negative_sign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/pos_format.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/pos_format.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/pos_format.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/pos_format.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/positive_sign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/positive_sign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/positive_sign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/positive_sign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/thousands_sep.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/thousands_sep.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/thousands_sep.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.members/thousands_sep.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.virtuals/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.virtuals/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.virtuals/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/locale.moneypunct.virtuals/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/money_base.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/money_base.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/money_base.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/money_base.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/types.pass.cpp
similarity index 89%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/types.pass.cpp
index 0d616e3..a76cea5 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/locale.moneypunct/types.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/locale.moneypunct/types.pass.cpp
@@ -6,6 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This test uses new symbols that were not defined in the libc++ shipped on
+// darwin11 and darwin12:
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <locale>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.monetary/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.monetary/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
index 7da56bb..2010dca 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
@@ -24413,7 +24413,7 @@
     output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
-#if __APPLE__
+#ifdef __APPLE__
 // This test is failing on FreeBSD, possibly due to different representations
 // of the floating point numbers.  
     const my_facet f(1);
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.virtuals/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.virtuals/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.virtuals/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.virtuals/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.nm.put/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_bool.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
similarity index 92%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
index 4550524..4e0f2b8 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: with_system_lib=x86_64-apple-darwin11
 
 // <locale>
 
@@ -238,4 +240,16 @@
         assert(iter.base() == str+sizeof(str)-1);
         assert(err == ios.failbit);
     }
+    {
+        v = -1;
+        const char str[] = "3;14159265358979323846264338327950288419716939937510582097494459230781640628620899862803482534211706798214808651e+10";
+        std::ios_base::iostate err = ios.goodbit;
+        input_iterator<const char*> iter =
+            f.get(input_iterator<const char*>(str),
+                  input_iterator<const char*>(str+sizeof(str)),
+                  ios, err, v);
+        assert(iter.base() == str+sizeof(str)-1);
+        assert(err == ios.goodbit);
+        assert(std::abs(v - 3.14159265358979e+10)/3.14159265358979e+10 < 1.e-8);
+    }
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp
similarity index 76%
copy from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
copy to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp
index 4550524..8e89ebc 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp
@@ -12,7 +12,7 @@
 // class num_get<charT, InputIterator>
 
 // iter_type get(iter_type in, iter_type end, ios_base&,
-//               ios_base::iostate& err, double& v) const;
+//               ios_base::iostate& err, long double& v) const;
 
 #include <locale>
 #include <ios>
@@ -32,23 +32,11 @@
         : F(refs) {}
 };
 
-class my_numpunct
-    : public std::numpunct<char>
-{
-public:
-    my_numpunct() : std::numpunct<char>() {}
-
-protected:
-    virtual char_type do_decimal_point() const {return ';';}
-    virtual char_type do_thousands_sep() const {return '_';}
-    virtual std::string do_grouping() const {return std::string("\1\2\3");}
-};
-
 int main()
 {
     const my_facet f(1);
     std::ios ios(0);
-    double v = -1;
+    long double v = -1;
     {
         const char str[] = "123";
         assert((ios.flags() & ios.basefield) == ios.dec);
@@ -106,7 +94,7 @@
                   ios, err, v);
         assert(iter.base() == str+sizeof(str)-1);
         assert(err == ios.goodbit);
-        assert(v == hexfloat<double>(0x125, 0, -1));
+        assert(v == hexfloat<long double>(0x125, 0, -1));
     }
     {
         const char str[] = "inf";
@@ -181,61 +169,63 @@
         assert(std::isnan(v));
     }
     {
-        v = -1;
-        const char str[] = "123_456_78_9;125";
+        const char str[] = "1.189731495357231765021264e+49321";
         std::ios_base::iostate err = ios.goodbit;
-        input_iterator<const char*> iter =
-            f.get(input_iterator<const char*>(str),
-                  input_iterator<const char*>(str+sizeof(str)),
-                  ios, err, v);
-        assert(iter.base() == str+3);
-        assert(err == ios.goodbit);
-        assert(v == 123);
-    }
-    {
-        v = -1;
-        const char str[] = "2-";
-        std::ios_base::iostate err = ios.goodbit;
-        input_iterator<const char*> iter =
-            f.get(input_iterator<const char*>(str),
-                  input_iterator<const char*>(str+sizeof(str)),
-                  ios, err, v);
-        assert(iter.base() == str+1);
-        assert(err == ios.goodbit);
-        assert(v == 2);
-    }
-    ios.imbue(std::locale(std::locale(), new my_numpunct));
-    {
-        v = -1;
-        const char str[] = "123_456_78_9;125";
-        std::ios_base::iostate err = ios.goodbit;
-        input_iterator<const char*> iter =
-            f.get(input_iterator<const char*>(str),
-                  input_iterator<const char*>(str+sizeof(str)),
-                  ios, err, v);
-        assert(iter.base() == str+sizeof(str)-1);
-        assert(err == ios.goodbit);
-        assert(v == 123456789.125);
-    }
-    {
-        v = -1;
-        const char str[] = "1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_"
-                           "1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_"
-                           "1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_"
-                           "1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_"
-                           "1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_"
-                           "1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_"
-                           "1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_"
-                           "1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_"
-                           "1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_"
-                           "1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_"
-                           "1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_1_2_3_4_5_6_7_8_9_0_";
-        std::ios_base::iostate err = ios.goodbit;
+        v = 0;
         input_iterator<const char*> iter =
             f.get(input_iterator<const char*>(str),
                   input_iterator<const char*>(str+sizeof(str)),
                   ios, err, v);
         assert(iter.base() == str+sizeof(str)-1);
         assert(err == ios.failbit);
+        assert(v == INFINITY);
+    }
+    {
+        const char str[] = "1.189731495357231765021264e+49329";
+        std::ios_base::iostate err = ios.goodbit;
+        v = 0;
+        input_iterator<const char*> iter =
+            f.get(input_iterator<const char*>(str),
+                  input_iterator<const char*>(str+sizeof(str)),
+                  ios, err, v);
+        assert(iter.base() == str+sizeof(str)-1);
+        assert(err == ios.failbit);
+        assert(v == INFINITY);
+    }
+    {
+        const char str[] = "11.189731495357231765021264e+4932";
+        std::ios_base::iostate err = ios.goodbit;
+        v = 0;
+        input_iterator<const char*> iter =
+            f.get(input_iterator<const char*>(str),
+                  input_iterator<const char*>(str+sizeof(str)),
+                  ios, err, v);
+        assert(iter.base() == str+sizeof(str)-1);
+        assert(err == ios.failbit);
+        assert(v == INFINITY);
+    }
+    {
+        const char str[] = "91.189731495357231765021264e+4932";
+        std::ios_base::iostate err = ios.goodbit;
+        v = 0;
+        input_iterator<const char*> iter =
+            f.get(input_iterator<const char*>(str),
+                  input_iterator<const char*>(str+sizeof(str)),
+                  ios, err, v);
+        assert(iter.base() == str+sizeof(str)-1);
+        assert(err == ios.failbit);
+        assert(v == INFINITY);
+    }
+    {
+        const char str[] = "304888344611713860501504000000";
+        std::ios_base::iostate err = ios.goodbit;
+        v = 0;
+        input_iterator<const char*> iter =
+            f.get(input_iterator<const char*>(str),
+                  input_iterator<const char*>(str+sizeof(str)),
+                  ios, err, v);
+        assert(iter.base() == str+sizeof(str)-1);
+        assert(err != ios.failbit);
+        assert(v == 304888344611713860501504000000.0L);
     }
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_long.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/test_min_max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/test_min_max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/test_min_max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/test_min_max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.virtuals/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.virtuals/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.virtuals/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.virtuals/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/locale.num.get/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.numeric/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/date_order_wide.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_date_wide.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
index 6d58337..973d374 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
@@ -93,7 +93,7 @@
         assert(t.tm_hour == 23);
         assert(err == std::ios_base::eofbit);
     }
-#if __APPLE__
+#ifdef __APPLE__
     {
         const my_facet f("ru_RU", 1);
         const wchar_t in[] = L"\x441\x443\x431\x431\x43E\x442\x430"
@@ -128,7 +128,7 @@
         assert(t.tm_hour == 23);
         assert(err == std::ios_base::eofbit);
     }
-#if __APPLE__
+#ifdef __APPLE__
     {
         const my_facet f("zh_CN", 1);
         const wchar_t in[] = L"\x516D"
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_time_wide.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_year_wide.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/date_order.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_date_wide.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_many.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_monthname_wide.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_one.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_time_wide.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_weekday_wide.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.members/get_year.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.virtuals/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.virtuals/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.virtuals/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/locale.time.get.virtuals/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/time_base.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/time_base.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/time_base.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/time_base.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.get/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.get/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.put/ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.put/ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.put/ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.put/ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.virtuals/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.virtuals/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.virtuals/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.put/locale.time.put.virtuals/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.put/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.put/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/locale.time.put/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/locale.time.put/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.time/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/category.time/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/decimal_point.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/decimal_point.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/decimal_point.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/decimal_point.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/thousands_sep.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/thousands_sep.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/thousands_sep.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct.byname/thousands_sep.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct/ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct/ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct/ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct/ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/decimal_point.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/decimal_point.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/decimal_point.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/decimal_point.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/falsename.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/falsename.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/falsename.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/falsename.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/grouping.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/grouping.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/grouping.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/grouping.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/thousands_sep.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/thousands_sep.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/thousands_sep.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/thousands_sep.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/truename.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/truename.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/truename.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.members/truename.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.virtuals/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.virtuals/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.virtuals/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct/facet.numpunct.virtuals/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/locale.numpunct/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/locale.numpunct/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facet.numpunct/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facet.numpunct/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facets.examples/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facets.examples/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.categories/facets.examples/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.categories/facets.examples/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_mode.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_mode.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_mode.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_mode.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf16.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf16.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf16.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf16.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf16_always_noconv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf16_always_noconv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf16_always_noconv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf16_always_noconv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf16_encoding.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf16_encoding.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf16_encoding.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf16_encoding.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf16_in.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf16_in.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf16_in.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf16_in.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf16_length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf16_length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf16_length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf16_length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf16_max_length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf16_max_length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf16_max_length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf16_max_length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf16_out.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf16_out.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf16_out.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf16_out.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf16_unshift.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf16_unshift.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf16_unshift.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf16_unshift.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_always_noconv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_always_noconv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_always_noconv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_always_noconv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_encoding.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_encoding.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_encoding.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_encoding.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_in.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_in.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_in.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_in.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_max_length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_max_length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_max_length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_max_length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_out.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_out.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_out.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_out.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_unshift.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_unshift.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_unshift.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_unshift.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_utf16_always_noconv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_utf16_always_noconv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_utf16_always_noconv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_utf16_always_noconv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_utf16_encoding.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_utf16_encoding.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_utf16_encoding.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_utf16_encoding.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_utf16_in.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_utf16_in.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_utf16_in.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_utf16_in.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_utf16_length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_utf16_length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_utf16_length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_utf16_length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_utf16_max_length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_utf16_max_length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_utf16_max_length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_utf16_max_length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_utf16_out.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_utf16_out.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_utf16_out.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_utf16_out.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_utf16_unshift.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_utf16_unshift.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/codecvt_utf8_utf16_unshift.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/codecvt_utf8_utf16_unshift.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.stdcvt/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.stdcvt/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.syn/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.syn/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locale.syn/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locale.syn/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/isalnum.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/isalnum.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/isalnum.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/isalnum.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/isalpha.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/isalpha.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/isalpha.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/isalpha.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/iscntrl.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/iscntrl.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/iscntrl.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/iscntrl.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/isdigit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/isdigit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/isdigit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/isdigit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/isgraph.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/isgraph.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/isgraph.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/isgraph.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/islower.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/islower.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/islower.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/islower.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/isprint.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/isprint.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/isprint.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/isprint.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/ispunct.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/ispunct.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/ispunct.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/ispunct.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/isspace.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/isspace.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/isspace.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/isspace.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/isupper.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/isupper.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/isupper.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/isupper.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/isxdigit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/isxdigit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/classification/isxdigit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/classification/isxdigit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/overflow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/overflow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/overflow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/overflow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/pbackfail.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/pbackfail.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/pbackfail.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/pbackfail.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/rdbuf.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/rdbuf.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/rdbuf.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/rdbuf.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/seekoff.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/seekoff.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/seekoff.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/seekoff.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/state.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/state.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/state.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/state.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/test.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/test.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/test.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/test.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/underflow.dat b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/underflow.dat
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/underflow.dat
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/underflow.dat
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/underflow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/underflow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/underflow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/underflow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/underflow_utf8.dat b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/underflow_utf8.dat
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.buffer/underflow_utf8.dat
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.buffer/underflow_utf8.dat
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.character/tolower.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.character/tolower.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.character/tolower.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.character/tolower.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.character/toupper.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.character/toupper.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.character/toupper.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.character/toupper.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.string/converted.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.string/converted.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.string/converted.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.string/converted.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt_state.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt_state.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt_state.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.string/ctor_codecvt_state.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.string/ctor_err_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.string/ctor_err_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.string/ctor_err_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.string/ctor_err_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.string/from_bytes.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.string/from_bytes.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.string/from_bytes.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.string/from_bytes.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.string/state.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.string/state.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.string/state.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.string/state.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.string/to_bytes.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.string/to_bytes.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.string/to_bytes.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.string/to_bytes.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.string/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.string/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/conversions.string/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/conversions.string/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/conversions/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/conversions/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.convenience/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.convenience/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.global.templates/has_facet.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.global.templates/has_facet.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.global.templates/has_facet.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.global.templates/has_facet.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale.global.templates/use_facet.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.global.templates/use_facet.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale.global.templates/use_facet.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale.global.templates/use_facet.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/char_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/char_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/char_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/char_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.cons/string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.cons/string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.members/combine.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.members/combine.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.members/combine.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.members/combine.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.members/name.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.members/name.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.members/name.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.members/name.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.operators/compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.operators/compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.operators/compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.operators/compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.operators/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.operators/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.operators/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.operators/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.statics/classic.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.statics/classic.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.statics/classic.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.statics/classic.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.statics/global.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.statics/global.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.statics/global.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.statics/global.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.types/locale.category/category.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.types/locale.category/category.pass.cpp
similarity index 88%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.types/locale.category/category.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.types/locale.category/category.pass.cpp
index b8ed596..399e4e8 100644
--- a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.types/locale.category/category.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.types/locale.category/category.pass.cpp
@@ -6,6 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This test uses new symbols that were not defined in the libc++ shipped on
+// darwin11 and darwin12:
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <locale>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.types/locale.facet/facet.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.types/locale.facet/facet.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.types/locale.facet/facet.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.types/locale.facet/facet.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.types/locale.id/id.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.types/locale.id/id.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.types/locale.id/id.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.types/locale.id/id.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.types/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.types/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/locale.types/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/locale.types/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/locale/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/locale/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/locale/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locales/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/locales/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/locales/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/localization.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/localization.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/localization.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/localization.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/localization/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/localization/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/localization/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/c.math/cmath.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/c.math/cmath.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/c.math/cmath.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/c.math/cmath.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/c.math/ctgmath.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/c.math/ctgmath.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/c.math/ctgmath.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/c.math/ctgmath.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/c.math/tgmath_h.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/c.math/tgmath_h.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/c.math/tgmath_h.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/c.math/tgmath_h.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/c.math/version_cmath.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/c.math/version_cmath.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/c.math/version_cmath.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/c.math/version_cmath.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/cfenv/cfenv.syn/cfenv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/cfenv/cfenv.syn/cfenv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/cfenv/cfenv.syn/cfenv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/cfenv/cfenv.syn/cfenv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/cfenv/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/cfenv/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/cfenv/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/cfenv/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/cases.h b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/cases.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/cases.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/cases.h
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/ccmplx/ccomplex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/ccmplx/ccomplex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/ccmplx/ccomplex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/ccmplx/ccomplex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/cmplx.over/arg.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/cmplx.over/arg.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/cmplx.over/arg.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/cmplx.over/arg.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/cmplx.over/conj.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/cmplx.over/conj.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/cmplx.over/conj.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/cmplx.over/conj.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/cmplx.over/imag.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/cmplx.over/imag.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/cmplx.over/imag.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/cmplx.over/imag.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/cmplx.over/norm.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/cmplx.over/norm.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/cmplx.over/norm.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/cmplx.over/norm.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/cmplx.over/pow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/cmplx.over/pow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/cmplx.over/pow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/cmplx.over/pow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/cmplx.over/proj.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/cmplx.over/proj.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/cmplx.over/proj.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/cmplx.over/proj.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/cmplx.over/real.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/cmplx.over/real.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/cmplx.over/real.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/cmplx.over/real.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/assignment_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/assignment_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/assignment_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/assignment_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/assignment_scalar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/assignment_scalar.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/assignment_scalar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/assignment_scalar.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/divide_equal_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/divide_equal_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/divide_equal_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/divide_equal_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/divide_equal_scalar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/divide_equal_scalar.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/divide_equal_scalar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/divide_equal_scalar.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/minus_equal_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/minus_equal_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/minus_equal_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/minus_equal_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/minus_equal_scalar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/minus_equal_scalar.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/minus_equal_scalar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/minus_equal_scalar.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/plus_equal_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/plus_equal_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/plus_equal_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/plus_equal_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/plus_equal_scalar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/plus_equal_scalar.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/plus_equal_scalar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/plus_equal_scalar.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/times_equal_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/times_equal_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/times_equal_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/times_equal_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/times_equal_scalar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/times_equal_scalar.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.member.ops/times_equal_scalar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.member.ops/times_equal_scalar.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.members/construct.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.members/construct.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.members/construct.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.members/construct.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.members/real_imag.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.members/real_imag.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.members/real_imag.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.members/real_imag.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_divide_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_divide_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_divide_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_divide_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_divide_scalar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_divide_scalar.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_divide_scalar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_divide_scalar.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_equals_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_equals_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_equals_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_equals_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_equals_scalar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_equals_scalar.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_equals_scalar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_equals_scalar.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_minus_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_minus_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_minus_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_minus_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_minus_scalar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_minus_scalar.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_minus_scalar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_minus_scalar.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_not_equals_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_not_equals_scalar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_not_equals_scalar.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_not_equals_scalar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_not_equals_scalar.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_plus_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_plus_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_plus_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_plus_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_plus_scalar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_plus_scalar.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_plus_scalar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_plus_scalar.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_times_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_times_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_times_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_times_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_times_scalar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_times_scalar.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/complex_times_scalar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/complex_times_scalar.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/scalar_divide_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/scalar_divide_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/scalar_divide_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/scalar_divide_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/scalar_equals_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/scalar_equals_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/scalar_equals_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/scalar_equals_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/scalar_minus_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/scalar_minus_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/scalar_minus_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/scalar_minus_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/scalar_not_equals_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/scalar_not_equals_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/scalar_not_equals_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/scalar_not_equals_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/scalar_plus_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/scalar_plus_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/scalar_plus_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/scalar_plus_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/scalar_times_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/scalar_times_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/scalar_times_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/scalar_times_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/stream_input.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/stream_input.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/stream_input.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/stream_input.pass.cpp
index 24644e3..1876147 100644
--- a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/stream_input.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/stream_input.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: with_system_lib=x86_64-apple-darwin11
 
 // <complex>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/stream_output.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/stream_output.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/stream_output.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/stream_output.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/unary_minus.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/unary_minus.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/unary_minus.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/unary_minus.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/unary_plus.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/unary_plus.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.ops/unary_plus.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.ops/unary_plus.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/double_float_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/double_float_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/double_float_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/double_float_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/double_float_implicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/double_float_implicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/double_float_implicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/double_float_implicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/double_long_double_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/double_long_double_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/double_long_double_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/double_long_double_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/double_long_double_implicit.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/double_long_double_implicit.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/double_long_double_implicit.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/double_long_double_implicit.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/float_double_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/float_double_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/float_double_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/float_double_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/float_double_implicit.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/float_double_implicit.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/float_double_implicit.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/float_double_implicit.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/float_long_double_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/float_long_double_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/float_long_double_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/float_long_double_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/float_long_double_implicit.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/float_long_double_implicit.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/float_long_double_implicit.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/float_long_double_implicit.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/long_double_double_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/long_double_double_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/long_double_double_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/long_double_double_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/long_double_double_implicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/long_double_double_implicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/long_double_double_implicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/long_double_double_implicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/long_double_float_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/long_double_float_explicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/long_double_float_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/long_double_float_explicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/long_double_float_implicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/long_double_float_implicit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.special/long_double_float_implicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.special/long_double_float_implicit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.synopsis/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.synopsis/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.synopsis/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.synopsis/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/acos.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/acos.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/acos.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/acos.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/acosh.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/acosh.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/acosh.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/acosh.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/asin.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/asin.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/asin.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/asin.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/asinh.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/asinh.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/asinh.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/asinh.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/atan.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/atan.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/atan.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/atan.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/atanh.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/atanh.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/atanh.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/atanh.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/cos.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/cos.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/cos.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/cos.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/cosh.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/cosh.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/cosh.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/cosh.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/exp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/exp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/exp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/exp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/log.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/log.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/log.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/log.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/log10.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/log10.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/log10.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/log10.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/pow_complex_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/pow_complex_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/pow_complex_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/pow_complex_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/pow_complex_scalar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/pow_complex_scalar.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/pow_complex_scalar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/pow_complex_scalar.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/pow_scalar_complex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/pow_scalar_complex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/pow_scalar_complex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/pow_scalar_complex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/sin.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/sin.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/sin.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/sin.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/sinh.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/sinh.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/sinh.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/sinh.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/sqrt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/sqrt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/sqrt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/sqrt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/tan.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/tan.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/tan.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/tan.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/tanh.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/tanh.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.transcendentals/tanh.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.transcendentals/tanh.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.value.ops/abs.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.value.ops/abs.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.value.ops/abs.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.value.ops/abs.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.value.ops/arg.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.value.ops/arg.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.value.ops/arg.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.value.ops/arg.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.value.ops/conj.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.value.ops/conj.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.value.ops/conj.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.value.ops/conj.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.value.ops/imag.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.value.ops/imag.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.value.ops/imag.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.value.ops/imag.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.value.ops/norm.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.value.ops/norm.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.value.ops/norm.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.value.ops/norm.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.value.ops/polar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.value.ops/polar.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.value.ops/polar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.value.ops/polar.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.value.ops/proj.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.value.ops/proj.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.value.ops/proj.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.value.ops/proj.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.value.ops/real.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.value.ops/real.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex.value.ops/real.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex.value.ops/real.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/complex/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/complex/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/layout.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/layout.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/layout.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/layout.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/complex.number/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/complex.number/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/complex.number/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/class.gslice/gslice.access/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/class.gslice/gslice.access/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/class.gslice/gslice.access/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/class.gslice/gslice.access/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/class.gslice/gslice.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/class.gslice/gslice.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/class.gslice/gslice.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/class.gslice/gslice.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/class.gslice/gslice.cons/start_size_stride.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/class.gslice/gslice.cons/start_size_stride.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/class.gslice/gslice.cons/start_size_stride.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/class.gslice/gslice.cons/start_size_stride.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/class.gslice/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/class.gslice/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/class.gslice/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/class.gslice/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/class.slice/cons.slice/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/class.slice/cons.slice/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/class.slice/cons.slice/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/class.slice/cons.slice/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/class.slice/cons.slice/start_size_stride.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/class.slice/cons.slice/start_size_stride.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/class.slice/cons.slice/start_size_stride.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/class.slice/cons.slice/start_size_stride.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/class.slice/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/class.slice/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/class.slice/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/class.slice/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/class.slice/slice.access/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/class.slice/slice.access/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/class.slice/slice.access/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/class.slice/slice.access/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/default.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/default.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/default.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/default.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.assign/gslice_array.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.assign/gslice_array.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.assign/gslice_array.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.assign/gslice_array.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.assign/valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.assign/valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.assign/valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.assign/valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/addition.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/addition.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/addition.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/addition.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/and.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/and.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/and.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/and.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/divide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/divide.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/divide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/divide.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/modulo.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/modulo.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/modulo.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/modulo.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/multiply.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/multiply.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/multiply.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/multiply.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/or.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/or.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/or.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/or.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/shift_left.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/shift_left.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/shift_left.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/shift_left.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/shift_right.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/shift_right.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/shift_right.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/shift_right.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/subtraction.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/subtraction.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/subtraction.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/subtraction.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/xor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/xor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/xor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.comp.assign/xor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.fill/assign_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.fill/assign_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/gslice.array.fill/assign_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/gslice.array.fill/assign_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.gslice.array/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.gslice.array/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/default.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/default.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/default.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/default.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.assign/indirect_array.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.assign/indirect_array.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.assign/indirect_array.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.assign/indirect_array.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.assign/valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.assign/valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.assign/valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.assign/valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/addition.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/addition.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/addition.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/addition.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/and.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/and.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/and.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/and.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/divide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/divide.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/divide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/divide.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/modulo.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/modulo.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/modulo.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/modulo.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/multiply.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/multiply.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/multiply.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/multiply.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/or.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/or.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/or.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/or.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/shift_left.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/shift_left.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/shift_left.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/shift_left.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/shift_right.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/shift_right.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/shift_right.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/shift_right.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/subtraction.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/subtraction.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/subtraction.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/subtraction.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/xor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/xor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/xor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.comp.assign/xor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.fill/assign_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.fill/assign_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/indirect.array.fill/assign_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/indirect.array.fill/assign_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.indirect.array/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.indirect.array/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/default.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/default.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/default.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/default.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.assign/mask_array.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.assign/mask_array.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.assign/mask_array.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.assign/mask_array.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.assign/valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.assign/valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.assign/valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.assign/valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/addition.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/addition.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/addition.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/addition.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/and.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/and.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/and.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/and.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/divide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/divide.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/divide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/divide.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/modulo.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/modulo.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/modulo.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/modulo.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/multiply.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/multiply.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/multiply.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/multiply.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/or.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/or.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/or.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/or.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/shift_left.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/shift_left.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/shift_left.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/shift_left.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/shift_right.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/shift_right.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/shift_right.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/shift_right.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/subtraction.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/subtraction.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/subtraction.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/subtraction.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/xor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/xor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.comp.assign/xor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.comp.assign/xor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.fill/assign_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.fill/assign_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/mask.array.fill/assign_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/mask.array.fill/assign_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.mask.array/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.mask.array/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/default.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/default.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/default.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/default.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.assign/slice_array.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.assign/slice_array.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.assign/slice_array.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.assign/slice_array.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.assign/valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.assign/valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.assign/valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.assign/valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/addition.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/addition.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/addition.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/addition.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/and.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/and.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/and.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/and.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/divide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/divide.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/divide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/divide.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/modulo.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/modulo.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/modulo.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/modulo.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/multiply.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/multiply.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/multiply.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/multiply.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/or.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/or.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/or.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/or.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/shift_left.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/shift_left.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/shift_left.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/shift_left.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/shift_right.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/shift_right.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/shift_right.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/shift_right.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/subtraction.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/subtraction.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/subtraction.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/subtraction.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/xor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/xor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/xor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.comp.assign/xor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.fill/assign_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.fill/assign_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/slice.arr.fill/assign_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/slice.arr.fill/assign_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.slice.array/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.slice.array/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.access/access.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.access/access.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.access/access.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.access/access.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.access/const_access.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.access/const_access.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.access/const_access.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.access/const_access.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.assign/copy_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.assign/copy_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.assign/copy_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.assign/copy_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.assign/gslice_array_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.assign/gslice_array_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.assign/gslice_array_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.assign/gslice_array_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.assign/indirect_array_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.assign/indirect_array_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.assign/indirect_array_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.assign/indirect_array_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.assign/initializer_list_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.assign/initializer_list_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.assign/initializer_list_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.assign/initializer_list_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.assign/mask_array_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.assign/mask_array_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.assign/mask_array_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.assign/mask_array_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.assign/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.assign/move_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.assign/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.assign/move_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.assign/slice_array_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.assign/slice_array_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.assign/slice_array_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.assign/slice_array_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.assign/value_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.assign/value_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.assign/value_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.assign/value_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/and_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/and_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/and_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/and_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/and_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/and_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/and_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/and_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/divide_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/divide_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/divide_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/divide_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/divide_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/divide_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/divide_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/divide_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/minus_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/minus_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/minus_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/minus_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/minus_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/minus_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/minus_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/minus_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/modulo_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/modulo_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/modulo_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/modulo_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/modulo_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/modulo_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/modulo_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/modulo_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/or_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/or_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/or_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/or_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/or_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/or_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/or_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/or_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/plus_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/plus_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/plus_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/plus_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/plus_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/plus_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/plus_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/plus_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/shift_left_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_left_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/shift_left_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_left_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/shift_left_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_left_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/shift_left_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_left_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/shift_right_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_right_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/shift_right_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_right_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/shift_right_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_right_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/shift_right_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/shift_right_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/times_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/times_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/times_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/times_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/times_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/times_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/times_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/times_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/xor_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/xor_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/xor_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/xor_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/xor_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/xor_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cassign/xor_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cassign/xor_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/gslice_array.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/gslice_array.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/gslice_array.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/gslice_array.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/indirect_array.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/indirect_array.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/indirect_array.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/indirect_array.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/mask_array.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/mask_array.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/mask_array.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/mask_array.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/pointer_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/pointer_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/pointer_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/pointer_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/slice_array.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/slice_array.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/slice_array.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/slice_array.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/value_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/value_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.cons/value_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.cons/value_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/apply_cref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/apply_cref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/apply_cref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/apply_cref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/apply_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/apply_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/apply_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/apply_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/cshift.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/cshift.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/cshift.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/cshift.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/resize.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/resize.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/resize.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/resize.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/shift.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/shift.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/shift.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/shift.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/sum.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/sum.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/sum.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/sum.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.members/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.members/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.sub/gslice_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.sub/gslice_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.sub/gslice_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.sub/gslice_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.sub/gslice_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.sub/gslice_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.sub/gslice_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.sub/gslice_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.sub/indirect_array_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.sub/indirect_array_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.sub/indirect_array_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.sub/indirect_array_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.sub/indirect_array_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.sub/indirect_array_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.sub/indirect_array_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.sub/indirect_array_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.sub/slice_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.sub/slice_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.sub/slice_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.sub/slice_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.sub/slice_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.sub/slice_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.sub/slice_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.sub/slice_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.sub/valarray_bool_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.sub/valarray_bool_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.sub/valarray_bool_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.sub/valarray_bool_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.sub/valarray_bool_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.sub/valarray_bool_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.sub/valarray_bool_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.sub/valarray_bool_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.unary/bit_not.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.unary/bit_not.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.unary/bit_not.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.unary/bit_not.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.unary/negate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.unary/negate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.unary/negate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.unary/negate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.unary/not.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.unary/not.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.unary/not.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.unary/not.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.unary/plus.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.unary/plus.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/template.valarray/valarray.unary/plus.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/template.valarray/valarray.unary/plus.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/and_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/and_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/and_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/and_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/and_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/and_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/and_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/and_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/and_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/and_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/and_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/and_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/divide_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/divide_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/divide_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/divide_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/divide_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/divide_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/divide_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/divide_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/divide_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/divide_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/divide_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/divide_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/minus_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/minus_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/minus_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/minus_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/minus_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/minus_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/minus_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/minus_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/minus_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/minus_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/minus_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/minus_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/modulo_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/modulo_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/modulo_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/modulo_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/modulo_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/modulo_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/modulo_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/modulo_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/modulo_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/modulo_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/modulo_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/modulo_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/or_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/or_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/or_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/or_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/or_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/or_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/or_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/or_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/or_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/or_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/or_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/or_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/plus_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/plus_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/plus_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/plus_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/plus_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/plus_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/plus_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/plus_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/plus_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/plus_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/plus_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/plus_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_left_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_left_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_left_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_left_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_left_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_left_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_left_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_left_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_left_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_left_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_left_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_left_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_right_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_right_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_right_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_right_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_right_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_right_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_right_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_right_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_right_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_right_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_right_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/shift_right_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/times_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/times_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/times_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/times_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/times_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/times_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/times_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/times_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/times_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/times_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/times_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/times_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/xor_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/xor_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/xor_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/xor_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/xor_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/xor_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/xor_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/xor_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/xor_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/xor_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.binary/xor_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.binary/xor_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/and_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/and_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/and_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/and_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/and_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/and_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/and_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/and_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/and_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/and_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/and_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/and_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/equal_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/equal_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/equal_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/equal_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/equal_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/equal_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/equal_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/equal_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/equal_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/equal_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/equal_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/equal_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_equal_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_equal_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_equal_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_equal_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_equal_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_equal_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_equal_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_equal_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_equal_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_equal_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_equal_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_equal_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/greater_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_equal_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_equal_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_equal_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_equal_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_equal_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_equal_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_equal_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_equal_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_equal_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_equal_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_equal_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_equal_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/less_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/not_equal_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/not_equal_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/not_equal_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/not_equal_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/not_equal_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/not_equal_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/not_equal_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/not_equal_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/not_equal_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/not_equal_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/not_equal_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/not_equal_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/or_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/or_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/or_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/or_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/or_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/or_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/or_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/or_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/or_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/or_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.comparison/or_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.comparison/or_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.special/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.special/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.special/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.special/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/abs_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/abs_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/abs_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/abs_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/acos_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/acos_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/acos_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/acos_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/asin_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/asin_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/asin_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/asin_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/atan2_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/atan2_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/atan2_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/atan2_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/atan2_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/atan2_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/atan2_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/atan2_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/atan2_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/atan2_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/atan2_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/atan2_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/atan_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/atan_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/atan_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/atan_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/cos_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/cos_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/cos_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/cos_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/cosh_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/cosh_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/cosh_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/cosh_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/exp_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/exp_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/exp_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/exp_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/log10_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/log10_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/log10_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/log10_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/log_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/log_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/log_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/log_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/pow_valarray_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/pow_valarray_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/pow_valarray_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/pow_valarray_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/pow_valarray_value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/pow_valarray_value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/pow_valarray_value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/pow_valarray_value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/pow_value_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/pow_value_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/pow_value_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/pow_value_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/sin_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/sin_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/sin_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/sin_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/sinh_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/sinh_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/sinh_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/sinh_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/sqrt_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/sqrt_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/sqrt_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/sqrt_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/tan_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/tan_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/tan_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/tan_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/tanh_valarray.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/tanh_valarray.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.nonmembers/valarray.transcend/tanh_valarray.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.nonmembers/valarray.transcend/tanh_valarray.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.range/begin_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.range/begin_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.range/begin_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.range/begin_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.range/begin_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.range/begin_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.range/begin_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.range/begin_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.range/end_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.range/end_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.range/end_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.range/end_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.range/end_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.range/end_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.range/end_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.range/end_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.syn/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.syn/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/valarray.syn/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/valarray.syn/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numarray/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numarray/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numarray/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/accumulate/accumulate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/accumulate/accumulate_op.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/inner.product/inner_product.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/inner.product/inner_product_comp.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/numeric.iota/iota.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/numeric.iota/iota.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/numeric.iota/iota.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/numeric.iota/iota.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numeric.ops/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.ops/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numeric.requirements/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.requirements/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numeric.requirements/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numeric.requirements/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/numerics.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numerics.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/numerics.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/numerics.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/ctor_engine_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/ctor_engine_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/ctor_engine_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/ctor_engine_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/ctor_engine_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/ctor_engine_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/ctor_engine_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/ctor_engine_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/ctor_result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/ctor_result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/ctor_result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/ctor_result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/ctor_sseq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/ctor_sseq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/ctor_sseq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/ctor_sseq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/discard.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/discard.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/discard.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/discard.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/seed_result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/seed_result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/seed_result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/seed_result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/seed_sseq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/seed_sseq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/seed_sseq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/seed_sseq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/values.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/values.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.disc/values.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.disc/values.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/ctor_engine_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/ctor_engine_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/ctor_engine_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/ctor_engine_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/ctor_engine_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/ctor_engine_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/ctor_engine_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/ctor_engine_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/ctor_result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/ctor_result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/ctor_result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/ctor_result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/ctor_sseq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/ctor_sseq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/ctor_sseq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/ctor_sseq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/discard.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/discard.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/discard.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/discard.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/seed_result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/seed_result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/seed_result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/seed_result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/seed_sseq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/seed_sseq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/seed_sseq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/seed_sseq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/values.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/values.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.ibits/values.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.ibits/values.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/ctor_engine_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/ctor_engine_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/ctor_engine_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/ctor_engine_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/ctor_engine_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/ctor_engine_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/ctor_engine_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/ctor_engine_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/ctor_result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/ctor_result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/ctor_result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/ctor_result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/ctor_sseq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/ctor_sseq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/ctor_sseq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/ctor_sseq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/discard.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/discard.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/discard.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/discard.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/seed_result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/seed_result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/seed_result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/seed_result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/seed_sseq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/seed_sseq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/seed_sseq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/seed_sseq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/values.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/values.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.adapt/rand.adapt.shuf/values.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.adapt/rand.adapt.shuf/values.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.device/ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.device/ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.device/ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.device/ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.device/entropy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.device/entropy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.device/entropy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.device/entropy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.device/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.device/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.device/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.device/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/ctor_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/ctor_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/ctor_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/ctor_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/ctor_int_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/ctor_int_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/ctor_int_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/ctor_int_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval.pass.cpp
similarity index 81%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval.pass.cpp
index 36b9efd..3bfd2af 100644
--- a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval.pass.cpp
@@ -177,15 +177,23 @@
         }
         var /= u.size();
         double dev = std::sqrt(var);
-        skew /= u.size() * dev * var;
-        kurtosis /= u.size() * var * var;
-        kurtosis -= 3;
+        // In this case:
+        //   skew     computes to 0./0. == nan
+        //   kurtosis computes to 0./0. == nan
+        //   x_skew     == inf
+        //   x_kurtosis == inf
+        //   These tests are commented out because UBSan warns about division by 0
+//        skew /= u.size() * dev * var;
+//        kurtosis /= u.size() * var * var;
+//        kurtosis -= 3;
         double x_mean = d.t() * d.p();
         double x_var = x_mean*(1-d.p());
-        double x_skew = (1-2*d.p()) / std::sqrt(x_var);
-        double x_kurtosis = (1-6*d.p()*(1-d.p())) / x_var;
+//        double x_skew = (1-2*d.p()) / std::sqrt(x_var);
+//        double x_kurtosis = (1-6*d.p()*(1-d.p())) / x_var;
         assert(mean == x_mean);
         assert(var == x_var);
+//        assert(skew == x_skew);
+//        assert(kurtosis == x_kurtosis);
     }
     {
         typedef std::binomial_distribution<> D;
@@ -215,15 +223,23 @@
         }
         var /= u.size();
         double dev = std::sqrt(var);
-        skew /= u.size() * dev * var;
-        kurtosis /= u.size() * var * var;
-        kurtosis -= 3;
+        // In this case:
+        //   skew     computes to 0./0. == nan
+        //   kurtosis computes to 0./0. == nan
+        //   x_skew     == -inf
+        //   x_kurtosis == inf
+        //   These tests are commented out because UBSan warns about division by 0
+//        skew /= u.size() * dev * var;
+//        kurtosis /= u.size() * var * var;
+//        kurtosis -= 3;
         double x_mean = d.t() * d.p();
         double x_var = x_mean*(1-d.p());
-        double x_skew = (1-2*d.p()) / std::sqrt(x_var);
-        double x_kurtosis = (1-6*d.p()*(1-d.p())) / x_var;
+//        double x_skew = (1-2*d.p()) / std::sqrt(x_var);
+//        double x_kurtosis = (1-6*d.p()*(1-d.p())) / x_var;
         assert(mean == x_mean);
         assert(var == x_var);
+//        assert(skew == x_skew);
+//        assert(kurtosis == x_kurtosis);
     }
     {
         typedef std::binomial_distribution<> D;
@@ -333,15 +349,23 @@
         }
         var /= u.size();
         double dev = std::sqrt(var);
-        skew /= u.size() * dev * var;
-        kurtosis /= u.size() * var * var;
-        kurtosis -= 3;
+        // In this case:
+        //   skew     computes to 0./0. == nan
+        //   kurtosis computes to 0./0. == nan
+        //   x_skew     == inf
+        //   x_kurtosis == inf
+        //   These tests are commented out because UBSan warns about division by 0
+//        skew /= u.size() * dev * var;
+//        kurtosis /= u.size() * var * var;
+//        kurtosis -= 3;
         double x_mean = d.t() * d.p();
         double x_var = x_mean*(1-d.p());
-        double x_skew = (1-2*d.p()) / std::sqrt(x_var);
-        double x_kurtosis = (1-6*d.p()*(1-d.p())) / x_var;
+//        double x_skew = (1-2*d.p()) / std::sqrt(x_var);
+//        double x_kurtosis = (1-6*d.p()*(1-d.p())) / x_var;
         assert(mean == x_mean);
         assert(var == x_var);
+//        assert(skew == x_skew);
+//        assert(kurtosis == x_kurtosis);
     }
     {
         typedef std::binomial_distribution<> D;
@@ -371,15 +395,23 @@
         }
         var /= u.size();
         double dev = std::sqrt(var);
-        skew /= u.size() * dev * var;
-        kurtosis /= u.size() * var * var;
-        kurtosis -= 3;
+        // In this case:
+        //   skew     computes to 0./0. == nan
+        //   kurtosis computes to 0./0. == nan
+        //   x_skew     == inf
+        //   x_kurtosis == inf
+        //   These tests are commented out because UBSan warns about division by 0
+//        skew /= u.size() * dev * var;
+//        kurtosis /= u.size() * var * var;
+//        kurtosis -= 3;
         double x_mean = d.t() * d.p();
         double x_var = x_mean*(1-d.p());
-        double x_skew = (1-2*d.p()) / std::sqrt(x_var);
-        double x_kurtosis = (1-6*d.p()*(1-d.p())) / x_var;
+//        double x_skew = (1-2*d.p()) / std::sqrt(x_var);
+//        double x_kurtosis = (1-6*d.p()*(1-d.p())) / x_var;
         assert(mean == x_mean);
         assert(var == x_var);
+//        assert(skew == x_skew);
+//        assert(kurtosis == x_kurtosis);
     }
     {
         typedef std::binomial_distribution<> D;
@@ -409,14 +441,22 @@
         }
         var /= u.size();
         double dev = std::sqrt(var);
-        skew /= u.size() * dev * var;
-        kurtosis /= u.size() * var * var;
-        kurtosis -= 3;
+        // In this case:
+        //   skew     computes to 0./0. == nan
+        //   kurtosis computes to 0./0. == nan
+        //   x_skew     == -inf
+        //   x_kurtosis == inf
+        //   These tests are commented out because UBSan warns about division by 0
+//        skew /= u.size() * dev * var;
+//        kurtosis /= u.size() * var * var;
+//        kurtosis -= 3;
         double x_mean = d.t() * d.p();
         double x_var = x_mean*(1-d.p());
-        double x_skew = (1-2*d.p()) / std::sqrt(x_var);
-        double x_kurtosis = (1-6*d.p()*(1-d.p())) / x_var;
+//        double x_skew = (1-2*d.p()) / std::sqrt(x_var);
+//        double x_kurtosis = (1-6*d.p()*(1-d.p())) / x_var;
         assert(mean == x_mean);
         assert(var == x_var);
+//        assert(skew == x_skew);
+//        assert(kurtosis == x_kurtosis);
     }
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/ctor_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/ctor_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/ctor_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/ctor_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/ctor_int_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/ctor_int_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/ctor_int_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/ctor_int_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/ctor_double_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/ctor_double_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/ctor_double_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/ctor_double_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/ctor_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/ctor_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/ctor_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/ctor_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/ctor_double_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/ctor_double_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/ctor_double_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/ctor_double_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/ctor_double_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/ctor_double_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/ctor_double_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/ctor_double_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/ctor_double_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/ctor_double_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/ctor_double_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/ctor_double_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/ctor_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/ctor_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/ctor_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/ctor_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/ctor_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/ctor_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/ctor_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/ctor_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/ctor_double_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/ctor_double_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/ctor_double_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/ctor_double_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/ctor_double_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/ctor_double_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/ctor_double_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/ctor_double_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/ctor_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/ctor_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/ctor_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/ctor_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/ctor_double_double.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/ctor_double_double.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/ctor_double_double.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/ctor_double_double.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_func.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_func.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_func.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_func.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_func.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_func.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_func.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_func.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_ctor_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_func.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_func.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_func.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_func.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_init_func.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_init_func.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_init_func.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_init_func.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_func.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_func.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_func.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_func.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_init_func.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_init_func.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_init_func.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_init_func.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_ctor_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_func.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_func.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_func.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_func.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_init_func.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_init_func.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_init_func.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_init_func.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/get_param.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/get_param.pass.cpp
index 4501666..57a8ca5 100644
--- a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/get_param.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/get_param.pass.cpp
@@ -25,7 +25,7 @@
         double b[] = {10, 14, 16, 17};
         double p[] = {25, 62.5, 12.5, 10};
         const size_t Np = sizeof(p) / sizeof(p[0]);
-        P pa(b, b+Np+1, p);
+        P pa(b, b+Np, p);
         D d(pa);
         assert(d.param() == pa);
     }
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/io.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/io.pass.cpp
index 791d959..1be2791 100644
--- a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/io.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/io.pass.cpp
@@ -33,7 +33,7 @@
         double b[] = {10, 14, 16, 17};
         double p[] = {25, 62.5, 12.5, 25};
         const size_t Np = sizeof(p) / sizeof(p[0]);
-        D d1(b, b+Np+1, p);
+        D d1(b, b+Np, p);
         std::ostringstream os;
         os << d1;
         std::istringstream is(os.str());
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_func.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_func.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_func.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_func.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_init_func.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_init_func.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_init_func.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_init_func.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_ctor_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/ctor_int_int.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/ctor_int_int.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/ctor_int_int.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/ctor_int_int.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/ctor_int_int.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/ctor_int_int.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/ctor_int_int.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/ctor_int_int.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/ctor_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/ctor_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/ctor_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/ctor_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/eval_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/eval_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/eval_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/eval_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/get_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/get_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/get_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/get_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/param_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/set_param.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/set_param.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/set_param.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/set_param.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/ctor_result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/ctor_result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/ctor_result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/ctor_result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/ctor_sseq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/ctor_sseq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/ctor_sseq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/ctor_sseq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/discard.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/discard.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/discard.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/discard.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/seed_result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/seed_result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/seed_result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/seed_result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/seed_sseq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/seed_sseq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/seed_sseq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/seed_sseq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/values.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/values.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.lcong/values.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.lcong/values.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/ctor_result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/ctor_result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/ctor_result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/ctor_result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/ctor_sseq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/ctor_sseq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/ctor_sseq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/ctor_sseq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/discard.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/discard.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/discard.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/discard.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/seed_result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/seed_result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/seed_result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/seed_result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/seed_sseq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/seed_sseq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/seed_sseq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/seed_sseq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/values.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/values.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.mers/values.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.mers/values.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/ctor_result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/ctor_result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/ctor_result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/ctor_result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/ctor_sseq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/ctor_sseq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/ctor_sseq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/ctor_sseq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/discard.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/discard.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/discard.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/discard.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/eval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/eval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/eval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/eval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/seed_result_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/seed_result_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/seed_result_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/seed_result_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/seed_sseq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/seed_sseq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/seed_sseq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/seed_sseq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/values.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/values.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.eng/rand.eng.sub/values.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.eng/rand.eng.sub/values.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/default_random_engine.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/default_random_engine.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/default_random_engine.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/default_random_engine.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/knuth_b.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/knuth_b.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/knuth_b.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/knuth_b.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/minstd_rand.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/minstd_rand.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/minstd_rand.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/minstd_rand.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/minstd_rand0.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/minstd_rand0.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/minstd_rand0.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/minstd_rand0.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/mt19937.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/mt19937.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/mt19937.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/mt19937.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/mt19937_64.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/mt19937_64.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/mt19937_64.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/mt19937_64.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/ranlux24.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/ranlux24.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/ranlux24.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/ranlux24.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/ranlux24_base.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/ranlux24_base.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/ranlux24_base.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/ranlux24_base.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/ranlux48.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/ranlux48.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/ranlux48.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/ranlux48.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/ranlux48_base.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/ranlux48_base.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.predef/ranlux48_base.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.predef/ranlux48_base.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.req/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.req/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.req/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.req/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.req/rand.req.adapt/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.req/rand.req.adapt/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.req/rand.req.adapt/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.req/rand.req.adapt/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.req/rand.req.dst/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.req/rand.req.dst/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.req/rand.req.dst/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.req/rand.req.dst/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.req/rand.req.eng/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.req/rand.req.eng/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.req/rand.req.eng/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.req/rand.req.eng/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.req/rand.req.genl/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.req/rand.req.genl/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.req/rand.req.genl/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.req/rand.req.genl/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.req/rand.req.seedseq/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.req/rand.req.seedseq/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.req/rand.req.seedseq/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.req/rand.req.seedseq/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.req/rand.req.urng/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.req/rand.req.urng/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.req/rand.req.urng/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.req/rand.req.urng/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.synopsis/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.synopsis/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.synopsis/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.synopsis/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/rand.util.seedseq/assign.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/rand.util.seedseq/assign.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/rand.util.seedseq/assign.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/rand.util.seedseq/assign.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/rand.util.seedseq/copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/rand.util.seedseq/copy.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/rand.util.seedseq/copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/rand.util.seedseq/copy.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/rand.util.seedseq/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/rand.util.seedseq/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/rand.util.seedseq/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/rand.util.seedseq/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/rand.util.seedseq/generate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/rand.util.seedseq/generate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/rand.util.seedseq/generate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/rand.util.seedseq/generate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/rand.util.seedseq/initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/rand.util.seedseq/initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/rand.util.seedseq/initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/rand.util.seedseq/initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/rand.util.seedseq/iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/rand.util.seedseq/iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/rand.util.seedseq/iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/rand.util.seedseq/iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/rand.util.seedseq/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/rand.util.seedseq/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/numerics/rand/rand.util/rand.util.seedseq/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/numerics/rand/rand.util/rand.util.seedseq/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.match/awk.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.match/awk.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.match/awk.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.match/awk.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.match/basic.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.match/basic.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.match/basic.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.match/basic.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.match/ecma.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.match/ecma.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.match/ecma.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.match/ecma.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.match/egrep.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.match/egrep.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.match/egrep.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.match/egrep.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.match/extended.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.match/extended.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.match/extended.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.match/extended.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.match/grep.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.match/grep.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.match/grep.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.match/grep.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.replace/test1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.replace/test1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.replace/test1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.replace/test1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.replace/test2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.replace/test2.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.replace/test2.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.replace/test2.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.replace/test3.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.replace/test3.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.replace/test3.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.replace/test3.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.replace/test4.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.replace/test4.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.replace/test4.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.replace/test4.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.replace/test5.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.replace/test5.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.replace/test5.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.replace/test5.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.replace/test6.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.replace/test6.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.replace/test6.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.replace/test6.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.search/awk.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.search/awk.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.search/awk.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.search/awk.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.search/basic.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.search/basic.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.search/basic.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.search/basic.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.search/ecma.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.search/ecma.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.search/ecma.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.search/ecma.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.search/egrep.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.search/egrep.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.search/egrep.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.search/egrep.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.search/extended.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.search/extended.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.search/extended.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.search/extended.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.search/grep.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.search/grep.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.alg.search/grep.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.alg.search/grep.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.alg/re.except/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.except/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.alg/re.except/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.alg/re.except/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.badexp/regex_error.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.badexp/regex_error.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.badexp/regex_error.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.badexp/regex_error.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.const/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.const/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.const/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.const/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.const/re.err/error_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.const/re.err/error_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.const/re.err/error_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.const/re.err/error_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.const/re.matchflag/match_flag_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.const/re.matchflag/match_flag_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.const/re.matchflag/match_flag_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.const/re.matchflag/match_flag_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.const/re.synopt/syntax_option_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.const/re.synopt/syntax_option_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.const/re.synopt/syntax_option_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.const/re.synopt/syntax_option_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.def/defns.regex.collating.element/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.def/defns.regex.collating.element/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.def/defns.regex.collating.element/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.def/defns.regex.collating.element/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.def/defns.regex.finite.state.machine/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.def/defns.regex.finite.state.machine/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.def/defns.regex.finite.state.machine/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.def/defns.regex.finite.state.machine/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.def/defns.regex.format.specifier/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.def/defns.regex.format.specifier/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.def/defns.regex.format.specifier/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.def/defns.regex.format.specifier/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.def/defns.regex.matched/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.def/defns.regex.matched/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.def/defns.regex.matched/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.def/defns.regex.matched/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.def/defns.regex.primary.equivalence.class/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.def/defns.regex.primary.equivalence.class/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.def/defns.regex.primary.equivalence.class/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.def/defns.regex.primary.equivalence.class/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.def/defns.regex.regular.expression/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.def/defns.regex.regular.expression/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.def/defns.regex.regular.expression/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.def/defns.regex.regular.expression/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.def/defns.regex.subexpression/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.def/defns.regex.subexpression/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.def/defns.regex.subexpression/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.def/defns.regex.subexpression/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.def/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.def/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.def/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.def/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.grammar/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.grammar/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.grammar/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.grammar/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.iter/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.iter/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.iter/re.regiter/re.regiter.cnstr/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.regiter/re.regiter.cnstr/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.iter/re.regiter/re.regiter.cnstr/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.regiter/re.regiter.cnstr/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.iter/re.regiter/re.regiter.comp/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.regiter/re.regiter.comp/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.iter/re.regiter/re.regiter.comp/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.regiter/re.regiter.comp/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.iter/re.regiter/re.regiter.deref/deref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.regiter/re.regiter.deref/deref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.iter/re.regiter/re.regiter.deref/deref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.regiter/re.regiter.deref/deref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.iter/re.regiter/re.regiter.incr/post.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.regiter/re.regiter.incr/post.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.iter/re.regiter/re.regiter.incr/post.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.regiter/re.regiter.incr/post.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.iter/re.regiter/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.regiter/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.iter/re.regiter/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.regiter/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/re.tokiter.cnstr/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/re.tokiter.cnstr/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/re.tokiter.cnstr/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/re.tokiter.cnstr/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.iter/re.tokiter/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.iter/re.tokiter/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/assign.il.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/assign.il.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/assign.il.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/assign.il.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/assign_ptr_flag.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/assign_ptr_flag.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/assign_ptr_flag.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/assign_ptr_flag.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/assign_ptr_size_flag.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/assign_ptr_size_flag.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/assign_ptr_size_flag.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/assign_ptr_size_flag.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/assign_string_flag.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/assign_string_flag.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/assign_string_flag.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/assign_string_flag.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/il.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/il.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/il.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/il.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.assign/string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.assign/string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.const/constants.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.const/constants.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.const/constants.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.const/constants.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/il_flg.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/il_flg.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/il_flg.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/il_flg.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/ptr_flg.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/ptr_flg.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/ptr_flg.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/ptr_flg.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/ptr_size_flg.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/ptr_size_flg.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/ptr_size_flg.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/ptr_size_flg.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/string_flg.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/string_flg.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.construct/string_flg.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.construct/string_flg.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.locale/imbue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.locale/imbue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.locale/imbue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.locale/imbue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.nonmemb/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.nonmemb/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.nonmemb/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.nonmemb/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.nonmemb/re.regex.nmswap/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.nonmemb/re.regex.nmswap/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.nonmemb/re.regex.nmswap/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.nonmemb/re.regex.nmswap/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.operations/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.operations/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.operations/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.operations/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.swap/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.swap/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/re.regex.swap/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/re.regex.swap/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.regex/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.regex/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.regex/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.req/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.req/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.req/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.req/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.acc/begin_end.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.acc/begin_end.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.acc/begin_end.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.acc/begin_end.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.acc/cbegin_cend.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.acc/cbegin_cend.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.acc/cbegin_cend.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.acc/cbegin_cend.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.acc/index.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.acc/index.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.acc/index.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.acc/index.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.acc/length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.acc/length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.acc/length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.acc/length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.acc/position.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.acc/position.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.acc/position.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.acc/position.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.acc/prefix.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.acc/prefix.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.acc/prefix.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.acc/prefix.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.acc/str.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.acc/str.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.acc/str.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.acc/str.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.acc/suffix.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.acc/suffix.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.acc/suffix.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.acc/suffix.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.all/get_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.all/get_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.all/get_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.all/get_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.const/allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.const/allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.const/allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.const/allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.const/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.const/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.const/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.const/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.form/form1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.form/form1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.form/form1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.form/form1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.form/form2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.form/form2.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.form/form2.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.form/form2.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.form/form3.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.form/form3.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.form/form3.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.form/form3.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.form/form4.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.form/form4.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.form/form4.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.form/form4.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.nonmember/equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.nonmember/equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.nonmember/equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.nonmember/equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.size/empty.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.size/empty.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.size/empty.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.size/empty.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.size/max_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.size/max_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.size/max_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.size/max_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.state/ready.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.state/ready.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.state/ready.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.state/ready.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.swap/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.swap/member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.swap/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.swap/member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.swap/non_member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.swap/non_member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/re.results.swap/non_member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/re.results.swap/non_member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.results/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.results/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.results/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.members/compare_string_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.members/compare_string_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.members/compare_string_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.members/compare_string_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.members/compare_sub_match.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.members/compare_sub_match.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.members/compare_sub_match.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.members/compare_sub_match.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.members/compare_value_type_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.members/compare_value_type_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.members/compare_value_type_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.members/compare_value_type_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.members/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.members/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.members/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.members/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.members/length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.members/length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.members/length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.members/length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.members/operator_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.members/operator_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.members/operator_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.members/operator_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.members/str.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.members/str.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.members/str.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.members/str.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.op/compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.op/compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.op/compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.op/compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.op/stream.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.op/stream.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.submatch/re.submatch.op/stream.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/re.submatch.op/stream.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.submatch/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.submatch/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.submatch/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/cmatch.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/cmatch.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/cmatch.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/cmatch.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/cregex_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/cregex_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/cregex_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/cregex_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/cregex_token_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/cregex_token_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/cregex_token_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/cregex_token_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/csub_match.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/csub_match.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/csub_match.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/csub_match.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/regex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/regex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/regex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/regex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/smatch.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/smatch.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/smatch.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/smatch.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/sregex_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/sregex_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/sregex_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/sregex_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/sregex_token_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/sregex_token_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/sregex_token_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/sregex_token_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/ssub_match.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/ssub_match.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/ssub_match.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/ssub_match.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/wcmatch.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wcmatch.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/wcmatch.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wcmatch.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/wcregex_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wcregex_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/wcregex_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wcregex_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/wcregex_token_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wcregex_token_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/wcregex_token_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wcregex_token_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/wcsub_match.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wcsub_match.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/wcsub_match.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wcsub_match.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/wregex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wregex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/wregex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wregex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/wsmatch.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wsmatch.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/wsmatch.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wsmatch.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/wsregex_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wsregex_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/wsregex_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wsregex_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/wsregex_token_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wsregex_token_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/wsregex_token_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wsregex_token_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.syn/wssub_match.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wssub_match.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.syn/wssub_match.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.syn/wssub_match.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.traits/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.traits/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.traits/getloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/getloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.traits/getloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/getloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.traits/imbue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/imbue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.traits/imbue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/imbue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.traits/isctype.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/isctype.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.traits/isctype.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/isctype.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.traits/length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.traits/length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.traits/lookup_classname.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/lookup_classname.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.traits/lookup_classname.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/lookup_classname.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.traits/lookup_collatename.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/lookup_collatename.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.traits/lookup_collatename.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/lookup_collatename.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.traits/transform.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/transform.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.traits/transform.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/transform.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.traits/transform_primary.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/transform_primary.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.traits/transform_primary.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/transform_primary.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.traits/translate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/translate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.traits/translate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/translate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.traits/translate_nocase.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/translate_nocase.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.traits/translate_nocase.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/translate_nocase.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.traits/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.traits/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/re/re.traits/value.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/value.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/re/re.traits/value.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/re/re.traits/value.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/test_allocator.h b/sources/cxx-stl/llvm-libc++/libcxx/test/re/test_allocator.h
similarity index 96%
copy from sources/cxx-stl/llvm-libc++/test/containers/test_allocator.h
copy to sources/cxx-stl/llvm-libc++/libcxx/test/re/test_allocator.h
index c5da7e6..eed33a0 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/test_allocator.h
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/re/test_allocator.h
@@ -48,8 +48,13 @@
     const_pointer address(const_reference x) const {return &x;}
     pointer allocate(size_type n, const void* = 0)
         {
-            if (count >= throw_after)
+            if (count >= throw_after) {
+#ifndef _LIBCPP_NO_EXCEPTIONS
                 throw std::bad_alloc();
+#else
+                std::terminate();
+#endif
+            }
             ++count;
             return (pointer)std::malloc(n * sizeof(T));
         }
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string.hash/strings.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string.hash/strings.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string.hash/strings.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string.hash/strings.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/input_iterator.h b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/input_iterator.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/input_iterator.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/input_iterator.h
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.access/at.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.access/at.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.access/at.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.access/at.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.access/back.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.access/back.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.access/back.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.access/back.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.access/front.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.access/front.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.access/front.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.access/front.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.access/index.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.access/index.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.access/index.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.access/index.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/capacity.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/capacity.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/capacity.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/clear.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/clear.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/clear.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/clear.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/empty.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/empty.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/empty.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/empty.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/max_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/max_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/max_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/max_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/reserve.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/reserve.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/reserve.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/reserve.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/resize_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/resize_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/resize_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/resize_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/resize_size_char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/resize_size_char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/resize_size_char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/resize_size_char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/shrink_to_fit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/shrink_to_fit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/shrink_to_fit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/shrink_to_fit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.capacity/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.capacity/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/char_assignment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/char_assignment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/char_assignment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/char_assignment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/copy_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/copy_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/copy_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/copy_assignment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/copy_assignment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/copy_assignment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/copy_assignment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/default_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/default_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/initializer_list_assignment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/iter_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/iter_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/move_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/move_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/move_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/move_assignment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/move_assignment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/move_assignment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/move_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/move_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/pointer_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/pointer_assignment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/pointer_size_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/size_char_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/substr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.cons/substr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.cons/substr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.iterators/begin.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.iterators/begin.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.iterators/begin.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.iterators/cbegin.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.iterators/cbegin.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.iterators/cbegin.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.iterators/cend.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.iterators/cend.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.iterators/cend.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.iterators/crbegin.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.iterators/crbegin.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.iterators/crbegin.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.iterators/crend.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.iterators/crend.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.iterators/crend.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.iterators/end.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.iterators/end.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.iterators/end.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.iterators/rbegin.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.iterators/rbegin.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.iterators/rbegin.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.iterators/rend.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.iterators/rend.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.iterators/rend.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_append/string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_assign/initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_assign/pointer_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_assign/rv_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_assign/size_char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_assign/string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_assign/string_size_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_copy/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_erase/iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_erase/pop_back.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_erase/size_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/iter_size_char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_pointer_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_size_char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_insert/size_string_size_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_op_plus_equal/string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_initializer_list.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_pointer_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_size_char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/iter_iter_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_pointer_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_size_char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_replace/size_size_string_size_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.modifiers/string_swap/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_extract.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string.io/stream_insert.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp
diff --git "a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_op\041=/pointer_string.pass.cpp" "b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_op\041=/pointer_string.pass.cpp"
similarity index 100%
rename from "sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_op\041=/pointer_string.pass.cpp"
rename to "sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_op\041=/pointer_string.pass.cpp"
diff --git "a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_op\041=/string_pointer.pass.cpp" "b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_op\041=/string_pointer.pass.cpp"
similarity index 100%
rename from "sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_op\041=/string_pointer.pass.cpp"
rename to "sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_op\041=/string_pointer.pass.cpp"
diff --git "a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_op\041=/string_string.pass.cpp" "b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_op\041=/string_string.pass.cpp"
similarity index 100%
rename from "sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_op\041=/string_string.pass.cpp"
rename to "sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_op\041=/string_string.pass.cpp"
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_op+/char_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_op+/pointer_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_char.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_op+/string_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/pointer_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_operator==/string_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/pointer_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_opgt/string_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/pointer_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_opgt=/string_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/pointer_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_oplt/string_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/pointer_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.nonmembers/string_oplt=/string_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string.accessors/c_str.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string.accessors/data.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string.accessors/get_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_compare/pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_compare/string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_compare/string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_compare/string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_compare/string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/char_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/pointer_size_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.first.not.of/string_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.first.of/char_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.first.of/pointer_size_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.first.of/string_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/char_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/pointer_size_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.last.not.of/string_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.last.of/char_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.last.of/pointer_size_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find.last.of/string_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find/char_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find/pointer_size_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_find/string_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_rfind/char_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_rfind/pointer_size_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_rfind/string_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.ops/string_substr/substr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.require/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.require/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/string.require/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/string.require/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/test_allocator.h b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/test_allocator.h
similarity index 94%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/test_allocator.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/test_allocator.h
index 001ca98..8985215 100644
--- a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/test_allocator.h
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/test_allocator.h
@@ -48,8 +48,13 @@
     const_pointer address(const_reference x) const {return &x;}
     pointer allocate(size_type n, const void* = 0)
         {
-            if (count >= throw_after)
+            if (count >= throw_after) {
+#ifndef _LIBCPP_NO_EXCEPTIONS
                 throw std::bad_alloc();
+#else
+                std::terminate();
+#endif
+            }
             ++count;
             return (pointer)std::malloc(n * sizeof(T));
         }
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/test_traits.h b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/test_traits.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/test_traits.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/test_traits.h
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/basic.string/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/basic.string/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/basic.string/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/c.strings/cctype.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/cctype.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/c.strings/cctype.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/cctype.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/c.strings/cstring.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/cstring.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/c.strings/cstring.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/cstring.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/c.strings/cuchar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/cuchar.pass.cpp
similarity index 93%
rename from sources/cxx-stl/llvm-libc++/test/strings/c.strings/cuchar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/cuchar.pass.cpp
index 1283678..d4c15db 100644
--- a/sources/cxx-stl/llvm-libc++/test/strings/c.strings/cuchar.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/cuchar.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: apple-darwin
 
 // <cuchar>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/c.strings/cwchar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/cwchar.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/c.strings/cwchar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/cwchar.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/c.strings/cwctype.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/cwctype.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/c.strings/cwctype.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/cwctype.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/c.strings/version_cctype.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/version_cctype.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/c.strings/version_cctype.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/version_cctype.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/c.strings/version_cstring.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/version_cstring.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/c.strings/version_cstring.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/version_cstring.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/c.strings/version_cuchar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/version_cuchar.pass.cpp
similarity index 94%
rename from sources/cxx-stl/llvm-libc++/test/strings/c.strings/version_cuchar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/version_cuchar.pass.cpp
index a18f343..fa47f0f 100644
--- a/sources/cxx-stl/llvm-libc++/test/strings/c.strings/version_cuchar.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/version_cuchar.pass.cpp
@@ -6,6 +6,8 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: apple-darwin
 
 // <cuchar>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/c.strings/version_cwchar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/version_cwchar.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/c.strings/version_cwchar.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/version_cwchar.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/c.strings/version_cwctype.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/version_cwctype.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/c.strings/version_cwctype.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/c.strings/version_cwctype.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.require/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.require/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.require/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.require/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/assign2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/assign2.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/assign2.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/assign2.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/assign3.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/assign3.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/assign3.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/assign3.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/eof.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/eof.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/eof.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/eof.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/eq_int_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/eq_int_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/eq_int_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/eq_int_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/find.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/find.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/find.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/find.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/lt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/lt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/lt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/lt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/not_eof.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/not_eof.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/not_eof.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/not_eof.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/to_char_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/to_char_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/to_char_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/to_char_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/to_int_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/to_int_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/to_int_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/to_int_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign3.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign3.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign3.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign3.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eof.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eof.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eof.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eof.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/find.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/find.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/find.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/find.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign3.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign3.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign3.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign3.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eof.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eof.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eof.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eof.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/find.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/find.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/find.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/find.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/assign2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/assign2.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/assign2.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/assign2.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/assign3.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/assign3.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/assign3.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/assign3.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/compare.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/compare.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/compare.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/compare.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/eof.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/eof.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/eof.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/eof.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/eq_int_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/eq_int_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/eq_int_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/eq_int_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/find.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/find.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/find.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/find.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/length.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/length.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/length.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/length.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/lt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/lt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/lt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/lt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/not_eof.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/not_eof.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/not_eof.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/not_eof.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/to_char_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/to_char_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/to_char_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/to_char_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/to_int_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/to_int_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/to_int_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/to_int_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.specializations/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.specializations/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.typedefs/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.typedefs/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/char.traits.typedefs/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/char.traits.typedefs/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/char.traits/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/char.traits/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/char.traits/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/string.classes/typedefs.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.classes/typedefs.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/string.classes/typedefs.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.classes/typedefs.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stod.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stod.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stod.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stod.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stof.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stof.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stof.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stof.pass.cpp
index 444a695..65809cb 100644
--- a/sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stof.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stof.pass.cpp
@@ -6,6 +6,9 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <string>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stoi.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stoi.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stoi.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stoi.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stol.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stol.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stol.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stol.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stold.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stold.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stold.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stold.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stoll.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stoll.pass.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stoll.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stoll.pass.cpp
index 3887b7d..a4ba6a3 100644
--- a/sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stoll.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stoll.pass.cpp
@@ -6,6 +6,9 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <string>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stoul.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stoul.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stoul.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stoul.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stoull.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stoull.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/string.conversions/stoull.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/stoull.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/string.conversions/to_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/to_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/string.conversions/to_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/to_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/string.conversions/to_wstring.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/to_wstring.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/string.conversions/to_wstring.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/string.conversions/to_wstring.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/strings.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/strings.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/strings.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/strings.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/strings/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/strings/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/strings/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/support/hexfloat.h b/sources/cxx-stl/llvm-libc++/libcxx/test/support/hexfloat.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/support/hexfloat.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/support/hexfloat.h
diff --git a/sources/cxx-stl/llvm-libc++/test/support/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/support/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/support/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/support/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/support/platform_support.h b/sources/cxx-stl/llvm-libc++/libcxx/test/support/platform_support.h
similarity index 82%
rename from sources/cxx-stl/llvm-libc++/test/support/platform_support.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/support/platform_support.h
index eff5af0..3ef9e32 100644
--- a/sources/cxx-stl/llvm-libc++/test/support/platform_support.h
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/support/platform_support.h
@@ -16,7 +16,7 @@
 #define PLATFORM_SUPPORT_H
 
 // locale names
-#if _WIN32
+#ifdef _WIN32
 // WARNING: Windows does not support UTF-8 codepages.
 // Locales are "converted" using http://docs.moodle.org/dev/Table_of_locales
 #define LOCALE_en_US_UTF_8     "English_United States.1252"
@@ -39,4 +39,25 @@
 #define LOCALE_zh_CN_UTF_8     "zh_CN.UTF-8"
 #endif
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string>
+
+inline
+std::string
+get_temp_file_name()
+{
+#ifdef _WIN32
+   char* p = _tempnam( NULL, NULL );
+   if (p == nullptr)
+       abort();
+    std::string s(p);
+    free( p );
+#else
+   std::string s("temp.XXXXXX");
+   mktemp(&s[0]);
+#endif
+   return s;
+}
+
 #endif // PLATFORM_SUPPORT_H
diff --git a/sources/cxx-stl/llvm-libc++/test/support/test_iterators.h b/sources/cxx-stl/llvm-libc++/libcxx/test/support/test_iterators.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/support/test_iterators.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/support/test_iterators.h
diff --git a/sources/cxx-stl/llvm-libc++/test/testit b/sources/cxx-stl/llvm-libc++/libcxx/test/testit
similarity index 85%
rename from sources/cxx-stl/llvm-libc++/test/testit
rename to sources/cxx-stl/llvm-libc++/libcxx/test/testit
index 945c700..9bf1ee0 100755
--- a/sources/cxx-stl/llvm-libc++/test/testit
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/testit
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # //===--------------------------- testit ---------------------------------===//
 # //
 # //                     The LLVM Compiler Infrastructure
@@ -67,43 +67,46 @@
 IMPLEMENTED_FAIL=0
 IMPLEMENTED_PASS=0
 
-function afunc
-{
+afunc() {
 	fail=0
 	pass=0
-	if (ls *.fail.cpp &> /dev/null)
+	if (ls *.fail.cpp > /dev/null 2>&1)
 	then
 		for FILE in $(ls *.fail.cpp); do
-			if $CC $OPTIONS $HEADER_INCLUDE $SOURCE_LIB $FILE $LIBS -o ./$TEST_EXE &> /dev/null
+			if $CC $OPTIONS $HEADER_INCLUDE $SOURCE_LIB $FILE $LIBS -o ./$TEST_EXE > /dev/null 2>&1
 			then
 				rm ./$TEST_EXE
 				echo "$FILE should not compile"
-				let "fail+=1"
+				fail=$(($fail+1))
 			else
-				let "pass+=1"
+				pass=$(($pass+1))
 			fi
 		done
 	fi
 
-	if (ls *.pass.cpp &> /dev/null)
+	if (ls *.pass.cpp > /dev/null 2>&1)
 	then
 		for FILE in $(ls *.pass.cpp); do
+            if [ "$VERBOSE" ]
+            then
+             	echo "Running test: " $FILE
+            fi
 			if $CC $OPTIONS $HEADER_INCLUDE $SOURCE_LIB $FILE $LIBS -o ./$TEST_EXE
 			then
 				if ./$TEST_EXE
 				then
 					rm ./$TEST_EXE
-					let "pass+=1"
+					pass=$(($pass+1))
 				else
 					echo "`pwd`/$FILE failed at run time"
 					echo "Compile line was:" $CC $OPTIONS $HEADER_INCLUDE $SOURCE_LIB $FILE $LIBS
-					let "fail+=1"
+					fail=$(($fail+1))
 					rm ./$TEST_EXE
 				fi
 			else
 				echo "`pwd`/$FILE failed to compile"
 				echo "Compile line was:" $CC $OPTIONS $HEADER_INCLUDE $SOURCE_LIB $FILE $LIBS
-				let "fail+=1"
+				fail=$(($fail+1))
 			fi
 		done
 	fi
@@ -111,24 +114,24 @@
 	if [ $fail -gt 0 ]
 	then
 		echo "failed $fail tests in `pwd`"
-		let "IMPLEMENTED_FAIL+=1"
+		IMPLEMENTED_FAIL=$(($IMPLEMENTED_FAIL+1))
 	fi
 	if [ $pass -gt 0 ]
 	then
 		echo "passed $pass tests in `pwd`"
 		if [ $fail -eq 0 ]
 		then
-			let "IMPLEMENTED_PASS+=1"
+			IMPLEMENTED_PASS=$((IMPLEMENTED_PASS+1))
 		fi
 	fi
 	if [ $fail -eq 0 -a $pass -eq 0 ]
 	then
 		echo "not implemented:  `pwd`"
-		let "UNIMPLEMENTED+=1"
+		UNIMPLEMENTED=$(($UNIMPLEMENTED+1))
 	fi
 
-	let "FAIL+=$fail"
-	let "PASS+=$pass"
+	FAIL=$(($FAIL+$fail))
+	PASS=$(($PASS+$pass))
 
 	for FILE in *
 	do
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.async/async.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.async/async.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.async/async.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.async/async.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.errors/default_error_condition.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.errors/default_error_condition.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.errors/default_error_condition.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.errors/default_error_condition.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.errors/equivalent_error_code_int.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.errors/equivalent_error_code_int.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.errors/equivalent_error_code_int.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.errors/equivalent_error_code_int.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.errors/equivalent_int_error_condition.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.errors/equivalent_int_error_condition.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.errors/equivalent_int_error_condition.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.errors/equivalent_int_error_condition.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.errors/future_category.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.errors/future_category.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.errors/future_category.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.errors/future_category.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.errors/make_error_code.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.errors/make_error_code.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.errors/make_error_code.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.errors/make_error_code.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.errors/make_error_condition.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.errors/make_error_condition.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.errors/make_error_condition.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.errors/make_error_condition.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.future_error/code.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.future_error/code.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.future_error/code.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.future_error/code.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.future_error/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.future_error/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.future_error/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.future_error/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.future_error/what.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.future_error/what.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.future_error/what.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.future_error/what.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.overview/future_errc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.overview/future_errc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.overview/future_errc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.overview/future_errc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.overview/future_status.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.overview/future_status.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.overview/future_status.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.overview/future_status.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.overview/is_error_code_enum_future_errc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.overview/is_error_code_enum_future_errc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.overview/is_error_code_enum_future_errc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.overview/is_error_code_enum_future_errc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.overview/launch.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.overview/launch.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.overview/launch.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.overview/launch.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/alloc_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/alloc_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/alloc_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/alloc_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/copy_assign.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/copy_assign.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/copy_assign.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/copy_assign.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/copy_ctor.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/copy_ctor.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/copy_ctor.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/copy_ctor.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/dtor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/dtor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/dtor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/dtor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/get_future.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/get_future.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/get_future.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/get_future.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/move_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/move_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/move_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/move_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/move_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/move_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_exception.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_exception.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_exception.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_exception.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_lvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_lvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_lvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_lvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_lvalue_at_thread_exit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_lvalue_at_thread_exit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_lvalue_at_thread_exit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_lvalue_at_thread_exit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_rvalue_at_thread_exit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_rvalue_at_thread_exit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_rvalue_at_thread_exit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_rvalue_at_thread_exit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_value_at_thread_exit_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_value_at_thread_exit_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_value_at_thread_exit_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_value_at_thread_exit_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_value_at_thread_exit_void.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_value_at_thread_exit_void.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_value_at_thread_exit_void.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_value_at_thread_exit_void.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_value_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_value_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_value_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_value_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_value_void.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_value_void.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/set_value_void.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/set_value_void.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/uses_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/uses_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.promise/uses_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.promise/uses_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/copy_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/copy_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/copy_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/copy_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/copy_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/copy_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/copy_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/copy_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/ctor_future.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/ctor_future.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/ctor_future.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/ctor_future.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/dtor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/dtor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/dtor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/dtor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/get.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/get.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/get.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/get.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/move_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/move_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/move_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/move_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/move_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/move_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/wait.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/wait.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/wait.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/wait.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/wait_for.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/wait_for.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/wait_for.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/wait_for.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/wait_until.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/wait_until.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.shared_future/wait_until.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.shared_future/wait_until.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.state/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.state/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.state/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.state/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/assign_copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/assign_copy.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/assign_copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/assign_copy.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/ctor_copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_copy.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/ctor_copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_copy.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/ctor_default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/ctor_default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/dtor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/dtor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/dtor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/dtor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/get_future.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/get_future.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/get_future.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/get_future.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/make_ready_at_thread_exit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/make_ready_at_thread_exit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/make_ready_at_thread_exit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/make_ready_at_thread_exit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/operator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/operator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/operator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/operator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/reset.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/reset.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/reset.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/reset.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.members/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.members/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.nonmembers/uses_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.nonmembers/uses_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/futures.task.nonmembers/uses_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/futures.task.nonmembers/uses_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.tas/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.tas/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/copy_assign.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/copy_assign.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/copy_assign.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/copy_assign.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/copy_ctor.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/copy_ctor.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/copy_ctor.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/copy_ctor.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/dtor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/dtor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/dtor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/dtor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/get.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/get.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/get.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/get.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/move_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/move_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/move_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/move_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/move_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/move_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/share.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/share.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/share.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/share.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/wait.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/wait.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/wait.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/wait.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/wait_for.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/wait_for.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/wait_for.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/wait_for.pass.cpp
index 796b75a..2a81a2c 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/wait_for.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/wait_for.pass.cpp
@@ -58,7 +58,7 @@
         f.wait();
         Clock::time_point t1 = Clock::now();
         assert(f.valid());
-        assert(t1-t0 < ms(5));
+        assert(t1-t0 < ms(50));
     }
     {
         typedef int& T;
@@ -74,7 +74,7 @@
         f.wait();
         Clock::time_point t1 = Clock::now();
         assert(f.valid());
-        assert(t1-t0 < ms(5));
+        assert(t1-t0 < ms(50));
     }
     {
         typedef void T;
@@ -90,6 +90,6 @@
         f.wait();
         Clock::time_point t1 = Clock::now();
         assert(f.valid());
-        assert(t1-t0 < ms(5));
+        assert(t1-t0 < ms(50));
     }
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/wait_until.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/wait_until.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/futures.unique_future/wait_until.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/futures.unique_future/wait_until.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/test_allocator.h b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/test_allocator.h
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/test_allocator.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/test_allocator.h
index 7644bc7..e04d432 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/futures/test_allocator.h
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/test_allocator.h
@@ -48,8 +48,13 @@
     const_pointer address(const_reference x) const {return &x;}
     pointer allocate(size_type n, const void* = 0)
         {
-            if (count >= throw_after)
+            if (count >= throw_after) {
+#ifndef _LIBCPP_NO_EXCEPTIONS
                 throw std::bad_alloc();
+#else
+                std::terminate();
+#endif
+            }
             ++count;
             return (pointer)std::malloc(n * sizeof(T));
         }
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/futures/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/futures/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/futures/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/macro.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/macro.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/macro.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/macro.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/cv_status.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/cv_status.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/cv_status.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/cv_status.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/notify_all_at_thread_exit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/notify_all_at_thread_exit.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/notify_all_at_thread_exit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/notify_all_at_thread_exit.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/assign.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/assign.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/assign.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/assign.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/copy.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/copy.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/destructor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/destructor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/destructor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/destructor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/native_handle.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/native_handle.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/native_handle.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/native_handle.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/notify_all.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/notify_all.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/notify_all.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/notify_all.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/notify_one.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/notify_one.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/notify_one.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/notify_one.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/wait.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/wait.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/wait.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/wait.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
index 6c94e72..038c946 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
@@ -50,7 +50,7 @@
     }
     else
     {
-        assert(t1 - t0 - milliseconds(250) < milliseconds(10));
+        assert(t1 - t0 - milliseconds(250) < milliseconds(50));
         assert(test2 == 0);
     }
     ++runs;
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/wait_for_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_for_pred.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/wait_for_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_for_pred.pass.cpp
index 930841d..ef7a9b6 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/wait_for_pred.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_for_pred.pass.cpp
@@ -58,7 +58,7 @@
     }
     else
     {
-        assert(t1 - t0 - milliseconds(250) < milliseconds(10));
+        assert(t1 - t0 - milliseconds(250) < milliseconds(50));
         assert(test2 == 0);
     }
     ++runs;
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/wait_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_pred.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/wait_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_pred.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/wait_until.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_until.pass.cpp
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/wait_until.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_until.pass.cpp
index 2fa6345..476cec5 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/wait_until.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_until.pass.cpp
@@ -65,7 +65,7 @@
     }
     else
     {
-        assert(t1 - t0 - Clock::duration(250) < Clock::duration(5));
+        assert(t1 - t0 - Clock::duration(250) < Clock::duration(50));
         assert(test2 == 0);
     }
     ++runs;
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/wait_until_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_until_pred.pass.cpp
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/wait_until_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_until_pred.pass.cpp
index 8421425..b7a4b3a 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvar/wait_until_pred.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_until_pred.pass.cpp
@@ -75,7 +75,7 @@
     }
     else
     {
-        assert(t1 - t0 - Clock::duration(250) < Clock::duration(5));
+        assert(t1 - t0 - Clock::duration(250) < Clock::duration(50));
         assert(test2 == 0);
         assert(!r);
     }
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/assign.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/assign.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/assign.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/assign.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/copy.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/copy.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/destructor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/destructor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/destructor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/destructor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/notify_all.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/notify_all.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/notify_all.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/notify_all.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/notify_one.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/notify_one.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/notify_one.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/notify_one.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/wait.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/wait.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/wait_for.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_for.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/wait_for.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_for.pass.cpp
index d50ad40..89759ac 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/wait_for.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_for.pass.cpp
@@ -53,7 +53,7 @@
     }
     else
     {
-        assert(t1 - t0 - milliseconds(250) < milliseconds(5));
+        assert(t1 - t0 - milliseconds(250) < milliseconds(50));
         assert(test2 == 0);
     }
     ++runs;
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp
index 856297d..bc4b7c3 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_for_pred.pass.cpp
@@ -61,7 +61,7 @@
     }
     else
     {
-        assert(t1 - t0 - milliseconds(250) < milliseconds(5));
+        assert(t1 - t0 - milliseconds(250) < milliseconds(50));
         assert(test2 == 0);
     }
     ++runs;
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/wait_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_pred.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/wait_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_pred.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp
index 7b21660..15bf809 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp
@@ -68,7 +68,7 @@
     }
     else
     {
-        assert(t1 - t0 - Clock::duration(250) < Clock::duration(5));
+        assert(t1 - t0 - Clock::duration(250) < Clock::duration(50));
         assert(test2 == 0);
     }
     ++runs;
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/wait_until_pred.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until_pred.pass.cpp
similarity index 99%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/wait_until_pred.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until_pred.pass.cpp
index 6a7a132..1490e11 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/thread.condition.condvarany/wait_until_pred.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until_pred.pass.cpp
@@ -79,7 +79,7 @@
     }
     else
     {
-        assert(t1 - t0 - Clock::duration(250) < Clock::duration(5));
+        assert(t1 - t0 - Clock::duration(250) < Clock::duration(50));
         assert(test2 == 0);
         assert(!r);
     }
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.condition/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.condition/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.condition/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock.algorithm/try_lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock.algorithm/try_lock.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock.algorithm/try_lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock.algorithm/try_lock.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.guard/adopt_lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/adopt_lock.pass.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.guard/adopt_lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/adopt_lock.pass.cpp
index 57341e8..6f68884 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.guard/adopt_lock.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/adopt_lock.pass.cpp
@@ -36,7 +36,7 @@
     t1 = Clock::now();
     }
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(2500000));  // within 2.5ms
+    assert(d < ms(50));  // within 50ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.guard/assign.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/assign.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.guard/assign.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/assign.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.guard/copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/copy.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.guard/copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/copy.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.pass.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.pass.cpp
index a0bcd38..d47222d 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.pass.cpp
@@ -35,7 +35,7 @@
     t1 = Clock::now();
     }
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(2500000));  // within 2.5ms
+    assert(d < ms(200));  // within 200ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.guard/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.guard/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.guard/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/copy_assign.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/copy_assign.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/copy_assign.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/copy_assign.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/copy_ctor.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/copy_ctor.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/copy_ctor.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/copy_ctor.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex.pass.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex.pass.cpp
index 6c12e1f..4b08aca 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex.pass.cpp
@@ -35,7 +35,7 @@
     t1 = Clock::now();
     }
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(2500000));  // within 2.5ms
+    assert(d < ms(50));  // within 50ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_adopt_lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_adopt_lock.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_adopt_lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_adopt_lock.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_defer_lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_defer_lock.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_defer_lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_defer_lock.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_duration.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_duration.pass.cpp
similarity index 94%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_duration.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_duration.pass.cpp
index 137c913..8370c56 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_duration.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_duration.pass.cpp
@@ -34,7 +34,7 @@
     assert(lk.owns_lock() == true);
     time_point t1 = Clock::now();
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(5000000));  // within 5ms
+    assert(d < ms(50));  // within 50ms
 }
 
 void f2()
@@ -44,7 +44,7 @@
     assert(lk.owns_lock() == false);
     time_point t1 = Clock::now();
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(5000000));  // within 5ms
+    assert(d < ms(50));  // within 50ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_time_point.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_time_point.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_time_point.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_time_point.pass.cpp
index 21ee88d..8faf88f 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_time_point.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_time_point.pass.cpp
@@ -44,7 +44,7 @@
     assert(lk.owns_lock() == false);
     time_point t1 = Clock::now();
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(5000000));  // within 5ms
+    assert(d < ms(50));  // within 50ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_try_to_lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_try_to_lock.pass.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_try_to_lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_try_to_lock.pass.cpp
index 999dc19..b6c64f5 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_try_to_lock.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_try_to_lock.pass.cpp
@@ -48,9 +48,8 @@
             break;
     }
     time_point t1 = Clock::now();
-    m.unlock();
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(50000000));  // within 50ms
+    assert(d < ms(200));  // within 200ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/lock.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/lock.pass.cpp
index fa50c7b..c101d89 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/lock.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/lock.pass.cpp
@@ -34,7 +34,7 @@
     time_point t1 = Clock::now();
     assert(lk.owns_lock() == true);
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(2500000));  // within 2.5ms
+    assert(d < ms(25));  // within 25ms
     try
     {
         lk.lock();
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/try_lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/try_lock.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/try_lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/try_lock.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/try_lock_for.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/try_lock_for.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/try_lock_for.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/try_lock_for.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/try_lock_until.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/try_lock_until.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/try_lock_until.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/try_lock_until.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/unlock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/unlock.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/unlock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.locking/unlock.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/nonmember_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/nonmember_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/nonmember_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/nonmember_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/release.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/release.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/release.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.mod/release.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/mutex.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/mutex.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/mutex.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/mutex.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/op_bool.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/op_bool.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/op_bool.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/op_bool.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/owns_lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/owns_lock.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/owns_lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.obs/owns_lock.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/thread.lock.unique/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/thread.lock.unique/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.lock/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.lock/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/assign.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/assign.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/assign.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/assign.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/copy.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/copy.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/lock.pass.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/lock.pass.cpp
index 222ebcb..8fde818 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/lock.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/lock.pass.cpp
@@ -35,7 +35,7 @@
     time_point t1 = Clock::now();
     m.unlock();
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(2500000));  // within 2.5ms
+    assert(d < ms(50));  // within 50ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/try_lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/try_lock.pass.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/try_lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/try_lock.pass.cpp
index 0d248c2..6ef0160 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/try_lock.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/try_lock.pass.cpp
@@ -37,7 +37,7 @@
     time_point t1 = Clock::now();
     m.unlock();
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(50000000));  // within 50ms
+    assert(d < ms(200));  // within 200ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/assign.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/assign.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/assign.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/assign.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/copy.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/copy.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/lock.pass.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/lock.pass.cpp
index 199f4d3..cd48151 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/lock.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/lock.pass.cpp
@@ -37,7 +37,7 @@
     m.unlock();
     m.unlock();
     ns d = t1 - t0 - ms(250);
-    assert(d < ms(10));  // within 10ms
+    assert(d < ms(200));  // within 200ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/native_handle.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/native_handle.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/native_handle.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/native_handle.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/try_lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/try_lock.pass.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/try_lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/try_lock.pass.cpp
index 2f82d4f..f63e0ef 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/try_lock.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/try_lock.pass.cpp
@@ -39,7 +39,7 @@
     m.unlock();
     m.unlock();
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(50000000));  // within 50ms
+    assert(d < ms(200));  // within 200ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/assign.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/assign.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/assign.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/assign.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/copy.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/copy.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/lock.pass.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/lock.pass.cpp
index be34e6d..a4b41ac 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/lock.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/lock.pass.cpp
@@ -35,7 +35,7 @@
     time_point t1 = Clock::now();
     m.unlock();
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(2500000));  // within 2.5ms
+    assert(d < ms(50));  // within 50ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock.pass.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock.pass.cpp
index 41ddbbc..d5a06bf 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock.pass.cpp
@@ -37,7 +37,7 @@
     time_point t1 = Clock::now();
     m.unlock();
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(50000000));  // within 50ms
+    assert(d < ms(200));  // within 200ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_for.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_for.pass.cpp
similarity index 93%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_for.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_for.pass.cpp
index 1253659..5e4d5f1 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_for.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_for.pass.cpp
@@ -34,7 +34,7 @@
     time_point t1 = Clock::now();
     m.unlock();
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(5000000));  // within 5ms
+    assert(d < ms(50));  // within 50ms
 }
 
 void f2()
@@ -43,7 +43,7 @@
     assert(m.try_lock_for(ms(250)) == false);
     time_point t1 = Clock::now();
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(5000000));  // within 5ms
+    assert(d < ms(50));  // within 50ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_until.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_until.pass.cpp
similarity index 94%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_until.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_until.pass.cpp
index ac70d4a..f19dec2 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_until.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/try_lock_until.pass.cpp
@@ -34,7 +34,7 @@
     time_point t1 = Clock::now();
     m.unlock();
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(5000000));  // within 5ms
+    assert(d < ms(50));  // within 50ms
 }
 
 void f2()
@@ -43,7 +43,7 @@
     assert(m.try_lock_until(Clock::now() + ms(250)) == false);
     time_point t1 = Clock::now();
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(5000000));  // within 5ms
+    assert(d < ms(50));  // within 50ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/assign.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/assign.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/assign.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/assign.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/copy.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/copy.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/lock.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/lock.pass.cpp
index 6e5c671..32bedb3 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/lock.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/lock.pass.cpp
@@ -37,7 +37,7 @@
     m.unlock();
     m.unlock();
     ns d = t1 - t0 - ms(250);
-    assert(d < ms(10));  // within 10ms
+    assert(d < ms(50));  // within 50ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock.pass.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock.pass.cpp
index fe5ef80..d56e8bc 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock.pass.cpp
@@ -39,7 +39,7 @@
     m.unlock();
     m.unlock();
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(50000000));  // within 50ms
+    assert(d < ms(200));  // within 200ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock_for.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock_for.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock_for.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock_for.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock_until.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock_until.pass.cpp
similarity index 94%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock_until.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock_until.pass.cpp
index bfda9ed..e5e9166 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock_until.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/try_lock_until.pass.cpp
@@ -36,7 +36,7 @@
     m.unlock();
     m.unlock();
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(5000000));  // within 5ms
+    assert(d < ms(50));  // within 50ms
 }
 
 void f2()
@@ -45,7 +45,7 @@
     assert(m.try_lock_until(Clock::now() + ms(250)) == false);
     time_point t1 = Clock::now();
     ns d = t1 - t0 - ms(250);
-    assert(d < ns(5000000));  // within 5ms
+    assert(d < ms(50));  // within 50ms
 }
 
 int main()
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.once/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.once/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.once/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.once/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.once/thread.once.callonce/call_once.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.once/thread.once.callonce/call_once.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.once/thread.once.callonce/call_once.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.once/thread.once.callonce/call_once.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.once/thread.once.onceflag/assign.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.once/thread.once.onceflag/assign.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.once/thread.once.onceflag/assign.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.once/thread.once.onceflag/assign.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.once/thread.once.onceflag/copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.once/thread.once.onceflag/copy.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.once/thread.once.onceflag/copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.once/thread.once.onceflag/copy.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.once/thread.once.onceflag/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.once/thread.once.onceflag/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/thread.once/thread.once.onceflag/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/thread.once/thread.once.onceflag/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.mutex/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.mutex/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.req/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.req/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.exception/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.exception/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.exception/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.exception/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.lockable/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.lockable/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.lockable/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.lockable/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.lockable/thread.req.lockable.basic/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.lockable/thread.req.lockable.basic/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.lockable/thread.req.lockable.basic/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.lockable/thread.req.lockable.basic/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.lockable/thread.req.lockable.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.lockable/thread.req.lockable.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.lockable/thread.req.lockable.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.lockable/thread.req.lockable.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.lockable/thread.req.lockable.req/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.lockable/thread.req.lockable.req/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.lockable/thread.req.lockable.req/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.lockable/thread.req.lockable.req/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.lockable/thread.req.lockable.timed/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.lockable/thread.req.lockable.timed/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.lockable/thread.req.lockable.timed/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.lockable/thread.req.lockable.timed/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.native/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.native/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.native/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.native/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.paramname/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.paramname/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.paramname/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.paramname/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.timing/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.timing/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.req/thread.req.timing/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.req/thread.req.timing/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.algorithm/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.algorithm/swap.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.algorithm/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.algorithm/swap.pass.cpp
index 4db3a1b..9a7f8dc 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.algorithm/swap.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.algorithm/swap.pass.cpp
@@ -32,7 +32,7 @@
     void operator()()
     {
         assert(alive_ == 1);
-        assert(n_alive == 1);
+        assert(n_alive >= 1);
         op_run = true;
     }
 };
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.assign/copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/copy.fail.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.assign/copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/copy.fail.cpp
index 246488e..7373886 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.assign/copy.fail.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/copy.fail.cpp
@@ -32,7 +32,7 @@
     void operator()()
     {
         assert(alive_ == 1);
-        assert(n_alive == 1);
+        assert(n_alive >= 1);
         op_run = true;
     }
 
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp
index 7e35652..1a5f320 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.assign/move.pass.cpp
@@ -32,14 +32,14 @@
     void operator()()
     {
         assert(alive_ == 1);
-        assert(n_alive == 1);
+        assert(n_alive >= 1);
         op_run = true;
     }
 
     void operator()(int i, double j)
     {
         assert(alive_ == 1);
-        assert(n_alive == 1);
+        assert(n_alive >= 1);
         assert(i == 5);
         assert(j == 5.5);
         op_run = true;
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.constr/F.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.constr/F.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.constr/F.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.constr/F.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.constr/copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.constr/copy.fail.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.constr/copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.constr/copy.fail.cpp
index afba0f7..f66474c 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.constr/copy.fail.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.constr/copy.fail.cpp
@@ -32,14 +32,14 @@
     void operator()()
     {
         assert(alive_ == 1);
-        assert(n_alive == 1);
+        assert(n_alive >= 1);
         op_run = true;
     }
 
     void operator()(int i, double j)
     {
         assert(alive_ == 1);
-        assert(n_alive == 1);
+        assert(n_alive >= 1);
         assert(i == 5);
         assert(j == 5.5);
         op_run = true;
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.constr/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.constr/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.constr/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.constr/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp
similarity index 95%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp
index 3d92b59..17268ab 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.constr/move.pass.cpp
@@ -32,14 +32,14 @@
     void operator()()
     {
         assert(alive_ == 1);
-        assert(n_alive == 1);
+        assert(n_alive >= 1);
         op_run = true;
     }
 
     void operator()(int i, double j)
     {
         assert(alive_ == 1);
-        assert(n_alive == 1);
+        assert(n_alive >= 1);
         assert(i == 5);
         assert(j == 5.5);
         op_run = true;
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.destr/dtor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.destr/dtor.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.destr/dtor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.destr/dtor.pass.cpp
index dfd8f57..e068c04 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.destr/dtor.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.destr/dtor.pass.cpp
@@ -32,7 +32,7 @@
     void operator()()
     {
         assert(alive_ == 1);
-        assert(n_alive == 1);
+        assert(n_alive >= 1);
         op_run = true;
     }
 };
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.id/assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.id/assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.id/assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.id/assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.id/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.id/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.id/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.id/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.id/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.id/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.id/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.id/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.id/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.id/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.id/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.id/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.id/lt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.id/lt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.id/lt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.id/lt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.id/stream.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.id/stream.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.id/stream.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.id/stream.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.id/thread_id.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.id/thread_id.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.id/thread_id.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.id/thread_id.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/detach.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/detach.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/detach.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/detach.pass.cpp
index c1391cb..dbb98b5 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/detach.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/detach.pass.cpp
@@ -32,7 +32,7 @@
     void operator()()
     {
         assert(alive_ == 1);
-        assert(n_alive == 1);
+        assert(n_alive >= 1);
         op_run = true;
     }
 };
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/get_id.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/get_id.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/get_id.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/get_id.pass.cpp
index d086fb6..6af4f3b 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/get_id.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/get_id.pass.cpp
@@ -32,7 +32,7 @@
     void operator()()
     {
         assert(alive_ == 1);
-        assert(n_alive == 1);
+        assert(n_alive >= 1);
         op_run = true;
     }
 };
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/join.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/join.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/join.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/join.pass.cpp
index 3b278da..32faef4 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/join.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/join.pass.cpp
@@ -32,7 +32,7 @@
     void operator()()
     {
         assert(alive_ == 1);
-        assert(n_alive == 1);
+        assert(n_alive >= 1);
         op_run = true;
     }
 };
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/joinable.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/joinable.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/joinable.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/joinable.pass.cpp
index 1cae60c..9c90eb7 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/joinable.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/joinable.pass.cpp
@@ -32,7 +32,7 @@
     void operator()()
     {
         assert(alive_ == 1);
-        assert(n_alive == 1);
+        assert(n_alive >= 1);
         op_run = true;
     }
 };
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp
similarity index 96%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp
index 8feded7..1aae922 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp
@@ -32,7 +32,7 @@
     void operator()()
     {
         assert(alive_ == 1);
-        assert(n_alive == 1);
+        assert(n_alive >= 1);
         op_run = true;
     }
 };
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/swap.pass.cpp
similarity index 97%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/swap.pass.cpp
index 46bccd6..820091e 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.member/swap.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.member/swap.pass.cpp
@@ -32,7 +32,7 @@
     void operator()()
     {
         assert(alive_ == 1);
-        assert(n_alive == 1);
+        assert(n_alive >= 1);
         op_run = true;
     }
 };
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.static/hardware_concurrency.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.static/hardware_concurrency.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/thread.thread.static/hardware_concurrency.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/thread.thread.static/hardware_concurrency.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.class/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.class/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.this/get_id.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.this/get_id.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.this/get_id.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.this/get_id.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp
similarity index 90%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp
index 2d5b4ac..d66db3f 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp
@@ -26,7 +26,7 @@
     std::this_thread::sleep_for(ms);
     time_point t1 = Clock::now();
     std::chrono::nanoseconds ns = (t1 - t0) - ms;
-    std::chrono::nanoseconds err = ms / 100;
-    // The time slept is within 1% of 500ms
+    std::chrono::nanoseconds err = 5 * ms / 100;
+    // The time slept is within 5% of 500ms
     assert(std::abs(ns.count()) < err.count());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.this/sleep_until.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.this/sleep_until.pass.cpp
similarity index 90%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.this/sleep_until.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.this/sleep_until.pass.cpp
index c0bf087..2f3bb9a 100644
--- a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.this/sleep_until.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.this/sleep_until.pass.cpp
@@ -26,7 +26,7 @@
     std::this_thread::sleep_until(t0 + ms);
     time_point t1 = Clock::now();
     std::chrono::nanoseconds ns = (t1 - t0) - ms;
-    std::chrono::nanoseconds err = ms / 100;
-    // The time slept is within 1% of 500ms
+    std::chrono::nanoseconds err = 5 * ms / 100;
+    // The time slept is within 5% of 500ms
     assert(std::abs(ns.count()) < err.count());
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.this/yield.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.this/yield.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/thread.thread.this/yield.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/thread.thread.this/yield.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/thread/thread.threads/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/thread/thread.threads/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/thread/thread.threads/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/allocs.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/converting_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.cnstr/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/allocate_size_hint.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/deallocate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/destroy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/inner_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/max_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocators.h b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocators.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/allocators.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/allocators.h
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/scoped.adaptor.operators/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/allocator.adaptor/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/allocator.adaptor/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/date.time/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/date.time/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/date.time/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/date.time/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/arithmetic.operations/divides.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/arithmetic.operations/divides.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/arithmetic.operations/divides.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/arithmetic.operations/divides.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/arithmetic.operations/minus.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/arithmetic.operations/minus.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/arithmetic.operations/minus.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/arithmetic.operations/minus.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/arithmetic.operations/modulus.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/arithmetic.operations/modulus.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/arithmetic.operations/modulus.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/arithmetic.operations/modulus.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/arithmetic.operations/negate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/arithmetic.operations/negate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/arithmetic.operations/negate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/arithmetic.operations/negate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/arithmetic.operations/plus.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/arithmetic.operations/plus.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/arithmetic.operations/plus.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/arithmetic.operations/plus.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_int_0.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_int_0.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_int_0.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_int_0.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_lvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_lvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_lvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_lvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_rvalue.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_rvalue.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_rvalue.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_rvalue.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_void_0.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_void_0.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_void_0.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/func.bind/func.bind.bind/invoke_void_0.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/func.bind/func.bind.isbind/is_bind_expression.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/func.bind/func.bind.isbind/is_bind_expression.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/func.bind/func.bind.isbind/is_bind_expression.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/func.bind/func.bind.isbind/is_bind_expression.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/func.bind/func.bind.isbind/is_placeholder.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/func.bind/func.bind.isbind/is_placeholder.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/func.bind/func.bind.isbind/is_placeholder.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/func.bind/func.bind.isbind/is_placeholder.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/func.bind/func.bind.place/placeholders.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/func.bind/func.bind.place/placeholders.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/func.bind/func.bind.place/placeholders.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/func.bind/func.bind.place/placeholders.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/func.bind/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/func.bind/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/func.bind/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/func.bind/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bind/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bind/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bitwise.operations/bit_and.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bitwise.operations/bit_and.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bitwise.operations/bit_and.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bitwise.operations/bit_and.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bitwise.operations/bit_or.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bitwise.operations/bit_or.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bitwise.operations/bit_or.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bitwise.operations/bit_or.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/comparisons/equal_to.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/comparisons/equal_to.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/comparisons/equal_to.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/comparisons/equal_to.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/comparisons/greater.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/comparisons/greater.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/comparisons/greater.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/comparisons/greater.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/comparisons/greater_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/comparisons/greater_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/comparisons/greater_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/comparisons/greater_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/comparisons/less.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/comparisons/less.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/comparisons/less.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/comparisons/less.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/comparisons/less_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/comparisons/less_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/comparisons/less_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/comparisons/less_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/comparisons/not_equal_to.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/comparisons/not_equal_to.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/comparisons/not_equal_to.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/comparisons/not_equal_to.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.def/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.def/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.def/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.def/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.memfn/member_data.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.memfn/member_data.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.memfn/member_data.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.memfn/member_data.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.memfn/member_data.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.memfn/member_data.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.memfn/member_data.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.memfn/member_data.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.memfn/member_function.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.memfn/member_function.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.memfn/member_function.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.memfn/member_function.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.memfn/member_function_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.memfn/member_function_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.memfn/member_function_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.memfn/member_function_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.memfn/member_function_const_volatile.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.memfn/member_function_const_volatile.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.memfn/member_function_const_volatile.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.memfn/member_function_const_volatile.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.memfn/member_function_volatile.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.memfn/member_function_volatile.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.memfn/member_function_volatile.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.memfn/member_function_volatile.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.require/binary_function.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.require/binary_function.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.require/binary_function.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.require/binary_function.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.require/unary_function.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.require/unary_function.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.require/unary_function.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.require/unary_function.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.badcall/bad_function_call.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.badcall/bad_function_call.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.badcall/bad_function_call.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.badcall/bad_function_call.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.badcall/func.wrap.badcall.const/bad_function_call_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.badcall/func.wrap.badcall.const/bad_function_call_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.badcall/func.wrap.badcall.const/bad_function_call_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.badcall/func.wrap.badcall.const/bad_function_call_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.cap/operator_bool.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.cap/operator_bool.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.cap/operator_bool.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.cap/operator_bool.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_incomplete.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_incomplete.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_incomplete.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_incomplete.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke_int_0.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke_int_0.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke_int_0.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke_int_0.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke_void_0.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke_void_0.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke_void_0.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke_void_0.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/assign_F_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.nullptr/operator_==.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.nullptr/operator_==.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.nullptr/operator_==.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.nullptr/operator_==.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.targ/target_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/containers/test_allocator.h b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h
similarity index 96%
copy from sources/cxx-stl/llvm-libc++/test/containers/test_allocator.h
copy to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h
index c5da7e6..eed33a0 100644
--- a/sources/cxx-stl/llvm-libc++/test/containers/test_allocator.h
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h
@@ -48,8 +48,13 @@
     const_pointer address(const_reference x) const {return &x;}
     pointer allocate(size_type n, const void* = 0)
         {
-            if (count >= throw_after)
+            if (count >= throw_after) {
+#ifndef _LIBCPP_NO_EXCEPTIONS
                 throw std::bad_alloc();
+#else
+                std::terminate();
+#endif
+            }
             ++count;
             return (pointer)std::malloc(n * sizeof(T));
         }
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/func.wrap/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/logical.operations/logical_and.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/logical.operations/logical_and.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/logical.operations/logical_and.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/logical.operations/logical_and.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/logical.operations/logical_not.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/logical.operations/logical_not.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/logical.operations/logical_not.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/logical.operations/logical_not.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/logical.operations/logical_or.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/logical.operations/logical_or.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/logical.operations/logical_or.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/logical.operations/logical_or.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/negators/binary_negate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/negators/binary_negate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/negators/binary_negate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/negators/binary_negate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/negators/not1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/negators/not1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/negators/not1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/negators/not1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/negators/not2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/negators/not2.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/negators/not2.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/negators/not2.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/negators/unary_negate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/negators/unary_negate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/negators/unary_negate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/negators/unary_negate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/binary.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/binary.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/binary.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/binary.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.const/type_ctor.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.const/type_ctor.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.const/type_ctor.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.const/type_ctor.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.helpers/cref_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.helpers/cref_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.helpers/cref_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.helpers/cref_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.helpers/cref_2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.helpers/cref_2.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.helpers/cref_2.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.helpers/cref_2.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.helpers/ref_1.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.helpers/ref_1.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.helpers/ref_1.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.helpers/ref_1.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.helpers/ref_1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.helpers/ref_1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.helpers/ref_1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.helpers/ref_1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.invoke/invoke.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.invoke/invoke.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.invoke/invoke.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.invoke/invoke.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.invoke/invoke.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.invoke/invoke.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.invoke/invoke.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.invoke/invoke.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.invoke/invoke_int_0.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.invoke/invoke_int_0.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.invoke/invoke_int_0.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.invoke/invoke_int_0.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.invoke/invoke_void_0.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.invoke/invoke_void_0.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/refwrap.invoke/invoke_void_0.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/refwrap.invoke/invoke_void_0.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/unary.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/unary.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/unary.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/unary.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/weak_result.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/weak_result.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/refwrap/weak_result.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/refwrap/weak_result.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/unord.hash/floating.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/unord.hash/floating.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/unord.hash/floating.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/unord.hash/floating.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/unord.hash/integral.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/unord.hash/integral.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/unord.hash/integral.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/unord.hash/integral.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/unord.hash/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/unord.hash/pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/unord.hash/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/unord.hash/pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/function.objects/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/function.objects/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.tag/allocator_arg.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.tag/allocator_arg.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.tag/allocator_arg.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.tag/allocator_arg.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.members/allocate_hint.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.members/allocate_hint.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.members/allocate_hint.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.members/allocate_hint.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.members/construct.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.members/construct.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.members/construct.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.members/construct.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.members/destroy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.members/destroy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.members/destroy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.members/destroy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.members/max_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.members/select_on_container_copy_construction.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.members/select_on_container_copy_construction.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.members/select_on_container_copy_construction.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.members/select_on_container_copy_construction.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/const_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/const_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/const_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/const_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/const_void_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/const_void_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/const_void_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/const_void_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/difference_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/difference_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/difference_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/difference_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_copy_assignment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_copy_assignment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_copy_assignment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_copy_assignment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_move_assignment.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_move_assignment.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_move_assignment.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_move_assignment.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/propagate_on_container_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/rebind_alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/rebind_alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/rebind_alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/rebind_alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/size_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/size_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/size_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/size_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/void_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/void_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator.traits.types/void_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator.traits.types/void_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/allocator_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/allocator_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/rebind_traits.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/rebind_traits.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/rebind_traits.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/rebind_traits.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/value_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/value_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.traits/value_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.traits/value_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.uses/allocator.uses.construction/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.uses/allocator.uses.construction/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.uses/allocator.uses.construction/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.uses/allocator.uses.construction/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.uses/allocator.uses.trait/uses_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.uses/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.uses/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/allocator.uses/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/allocator.uses/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/c.malloc/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/c.malloc/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/c.malloc/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/c.malloc/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/default.allocator/allocator.globals/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/default.allocator/allocator.globals/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/default.allocator/allocator.globals/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/default.allocator/allocator.globals/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/default.allocator/allocator.members/address.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/default.allocator/allocator.members/address.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/default.allocator/allocator.members/address.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/default.allocator/allocator.members/address.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/default.allocator/allocator.members/construct.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/default.allocator/allocator.members/construct.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/default.allocator/allocator.members/construct.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/default.allocator/allocator.members/construct.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/default.allocator/allocator.members/max_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/default.allocator/allocator.members/max_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/default.allocator/allocator.members/max_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/default.allocator/allocator.members/max_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/default.allocator/allocator_types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/default.allocator/allocator_types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/default.allocator/allocator_types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/default.allocator/allocator_types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/default.allocator/allocator_void.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/default.allocator/allocator_void.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/default.allocator/allocator_void.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/default.allocator/allocator_void.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/difference_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/difference_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/difference_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/difference_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/element_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/element_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/element_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/element_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/pointer.traits.functions/pointer_to.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/pointer.traits.functions/pointer_to.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/pointer.traits.functions/pointer_to.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/pointer.traits.functions/pointer_to.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/pointer.traits.types/difference_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/pointer.traits.types/difference_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/pointer.traits.types/difference_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/pointer.traits.types/difference_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/pointer.traits.types/element_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/pointer.traits.types/element_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/pointer.traits.types/element_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/pointer.traits.types/element_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/pointer.traits.types/rebind.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/pointer.traits.types/rebind.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/pointer.traits.types/rebind.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/pointer.traits.types/rebind.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/pointer_to.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/pointer_to.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/pointer_to.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/pointer_to.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/rebind.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/rebind.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/pointer.traits/rebind.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/pointer.traits/rebind.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/ptr.align/align.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/ptr.align/align.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/ptr.align/align.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/ptr.align/align.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/specialized.algorithms/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/specialized.algorithms/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/specialized.algorithms/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/specialized.algorithms/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp
similarity index 76%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp
index 3f1bef1..e07bec4 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp
@@ -19,8 +19,17 @@
     void operator&() const {}
 };
 
+struct nothing {
+    operator char&()
+    {
+        static char c;
+        return c;
+    }
+};
+
 int main()
 {
+    {
     int i;
     double d;
     assert(std::addressof(i) == &i);
@@ -30,4 +39,13 @@
     assert(std::addressof(*tp) == tp);
     assert(std::addressof(*ctp) == tp);
     delete tp;
+    }
+    {
+    union
+    {
+        nothing n;
+        int i;
+    };
+    assert(std::addressof(n) == (void*)std::addressof(i));
+    }
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy_n.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy_n.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy_n.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/specialized.algorithms/uninitialized.copy/uninitialized_copy_n.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/specialized.algorithms/uninitialized.fill.n/uninitialized_fill_n.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/specialized.algorithms/uninitialized.fill.n/uninitialized_fill_n.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/specialized.algorithms/uninitialized.fill.n/uninitialized_fill_n.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/specialized.algorithms/uninitialized.fill.n/uninitialized_fill_n.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/specialized.algorithms/uninitialized.fill/uninitialized_fill.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/specialized.algorithms/uninitialized.fill/uninitialized_fill.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/specialized.algorithms/uninitialized.fill/uninitialized_fill.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/specialized.algorithms/uninitialized.fill/uninitialized_fill.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/storage.iterator/raw_storag_iterator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/storage.iterator/raw_storag_iterator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/storage.iterator/raw_storag_iterator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/storage.iterator/raw_storag_iterator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/temporary.buffer/temporary_buffer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/temporary.buffer/temporary_buffer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/temporary.buffer/temporary_buffer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/temporary.buffer/temporary_buffer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/deleter.h b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/deleter.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/deleter.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/deleter.h
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.dltr/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.dltr/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/convert_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/convert_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/convert_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/convert_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/incomplete.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/incomplete.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/incomplete.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/incomplete.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/strings/c.strings/version_cuchar.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/void.fail.cpp
similarity index 64%
copy from sources/cxx-stl/llvm-libc++/test/strings/c.strings/version_cuchar.pass.cpp
copy to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/void.fail.cpp
index a18f343..5d1cf1f 100644
--- a/sources/cxx-stl/llvm-libc++/test/strings/c.strings/version_cuchar.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/void.fail.cpp
@@ -7,14 +7,18 @@
 //
 //===----------------------------------------------------------------------===//
 
-// <cuchar>
+// <memory>
 
-#include <cuchar>
+// default_delete
 
-#ifndef _LIBCPP_VERSION
-#error _LIBCPP_VERSION not defined
-#endif
+// Test that default_delete's operator() requires a complete type
+
+#include <memory>
+#include <cassert>
 
 int main()
 {
+    std::default_delete<const void> d;
+    const void* p = 0;
+    d(p);
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/incomplete.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/incomplete.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/incomplete.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/incomplete.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move01.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move01.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move01.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move01.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move01.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move01.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move01.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move01.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move02.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move02.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move02.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move02.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move03.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move03.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move03.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move03.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move04.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move04.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move04.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move04.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert01.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert01.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert01.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert01.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert02.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert02.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert02.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert02.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert03.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert03.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert03.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert03.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert04.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert04.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert04.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert04.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert05.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert05.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert05.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert05.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert06.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert06.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert06.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert06.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert07.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert07.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert07.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert07.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert08.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert08.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert08.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert08.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert09.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert09.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert09.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/move_convert09.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/null_asgn.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/null_asgn.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/null_asgn.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/null_asgn.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/null_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/null_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/null_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/null_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/nullptr_asgn.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/nullptr_asgn.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/nullptr_asgn.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/nullptr_asgn.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/pointer_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/pointer_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/pointer_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/pointer_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default01.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default01.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default01.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default01.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default01.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default01.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default01.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default01.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default02.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default02.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default02.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default02.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default02.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default02.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default02.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default02.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default03.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default03.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default03.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/default03.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move01.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move01.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move01.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move01.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move01.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move01.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move01.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move01.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move02.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move02.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move02.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move02.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move02.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move02.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move02.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move02.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move03.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move03.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move03.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move03.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move04.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move04.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move04.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move04.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert01.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert01.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert01.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert01.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert02.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert02.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert02.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert02.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert03.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert03.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert03.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert03.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert04.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert04.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert04.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert04.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert05.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert05.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert05.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert05.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert06.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert06.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert06.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert06.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert07.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert07.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert07.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert07.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert08.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert08.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert08.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert08.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert09.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert09.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert09.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert09.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert10.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert10.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert10.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert10.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert11.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert11.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert11.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert11.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert12.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert12.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert12.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert12.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert13.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert13.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert13.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert13.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert14.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert14.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert14.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert14.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert15.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert15.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert15.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert15.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert16.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert16.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert16.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert16.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert17.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert17.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert17.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert17.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert18.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert18.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert18.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/move_convert18.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/nullptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/nullptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/nullptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/nullptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer01.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer01.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer01.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer01.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer01.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer01.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer01.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer01.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer02.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer02.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer02.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer02.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer02.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer02.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer02.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer02.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer03.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer03.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer03.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer03.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer04.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer04.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer04.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer04.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter01.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter01.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter01.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter01.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter02.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter02.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter02.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter02.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter03.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter03.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter03.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter03.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter04.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter04.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter04.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter04.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter04.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter04.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter04.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter04.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter05.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter05.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter05.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.ctor/pointer_deleter05.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/release.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/release.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/release.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/release.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/reset1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/reset1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/reset1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/reset1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/reset2.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/reset2.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/reset2.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/reset2.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.modifiers/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/dereference.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/dereference.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/dereference.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/dereference.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/explicit_bool.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/explicit_bool.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/explicit_bool.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/explicit_bool.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/get.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/get.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/get.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/get.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/get_deleter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/get_deleter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/get_deleter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/get_deleter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/index.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/index.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/index.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/index.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/op_arrow.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/op_arrow.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/op_arrow.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.runtime/unique.ptr.runtime.observers/op_arrow.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/pointer_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/pointer_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/pointer_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/pointer_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move01.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move01.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move01.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move01.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move01.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move01.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move01.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move01.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move02.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move02.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move02.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move02.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move03.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move03.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move03.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move03.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move04.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move04.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move04.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move04.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert01.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert02.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert03.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert04.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert04.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert04.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert04.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert05.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert05.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert05.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert05.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert06.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert06.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert06.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert06.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert13.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert13.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert13.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/move_convert13.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/null.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/null.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/null.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/null.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/nullptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/nullptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/nullptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.asgn/nullptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer01.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer01.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer01.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer01.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer02.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer02.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer02.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/auto_pointer02.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default01.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default01.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default01.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default01.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default01.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default01.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default01.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default01.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default02.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default02.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default02.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default02.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default02.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default02.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default02.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default02.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default03.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default03.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default03.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/default03.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move01.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move01.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move01.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move01.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move01.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move01.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move01.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move01.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move02.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move02.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move02.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move02.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move02.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move02.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move02.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move02.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move03.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move03.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move03.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move03.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move04.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move04.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move04.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move04.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert01.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert02.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert03.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert04.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert05.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert06.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert07.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert08.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert08.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert08.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert08.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert09.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert09.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert09.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert09.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert10.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert10.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert10.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert10.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert11.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert11.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert11.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert11.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert12.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert12.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert12.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert12.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert13.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert13.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert13.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/move_convert13.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/nullptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/nullptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/nullptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/nullptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer01.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer01.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer01.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer01.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer01.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer01.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer01.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer01.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer02.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer02.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer02.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer02.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer02.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer02.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer02.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer02.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer03.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer03.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer03.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer03.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer03.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer03.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer03.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer03.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter01.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter01.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter01.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter01.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter02.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter02.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter02.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter02.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter03.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter03.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter03.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter03.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter04.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter04.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter04.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter04.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter04.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter04.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter04.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter04.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter05.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter05.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter05.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter05.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter06.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter06.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter06.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.ctor/pointer_deleter06.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.dtor/null.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.dtor/null.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.dtor/null.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.dtor/null.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/release.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/release.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/release.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/release.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset1.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset1.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset1.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset1.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset2.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset2.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset2.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset2.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset_self.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset_self.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset_self.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/reset_self.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.modifiers/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/dereference.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/dereference.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/dereference.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/dereference.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/explicit_bool.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/explicit_bool.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/explicit_bool.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/explicit_bool.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/get.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/get.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/get.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/get.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/get_deleter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/get_deleter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/get_deleter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/get_deleter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/index.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/index.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/index.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/index.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/op_arrow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/op_arrow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/op_arrow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.single/unique.ptr.single.observers/op_arrow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.special/cmp_nullptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.special/cmp_nullptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.special/cmp_nullptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.special/cmp_nullptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.special/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.special/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.special/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.special/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.special/rel.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.special/rel.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.special/rel.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.special/rel.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.special/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.special/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/unique.ptr/unique.ptr.special/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/unique.ptr/unique.ptr.special/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.dynamic.safety/declare_no_pointers.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.dynamic.safety/declare_no_pointers.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.dynamic.safety/declare_no_pointers.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.dynamic.safety/declare_no_pointers.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.dynamic.safety/declare_reachable.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.dynamic.safety/declare_reachable.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.dynamic.safety/declare_reachable.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.dynamic.safety/declare_reachable.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.dynamic.safety/get_pointer_safety.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.dynamic.safety/get_pointer_safety.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.dynamic.safety/get_pointer_safety.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.dynamic.safety/get_pointer_safety.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp
similarity index 85%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp
index 5f2d095..0c80324 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong.pass.cpp
@@ -6,6 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This test uses new symbols that were not defined in the libc++ shipped on
+// darwin11 and darwin12:
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <memory>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp
similarity index 89%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp
index a068a1d..9f93ae8 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_strong_explicit.pass.cpp
@@ -6,6 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This test uses new symbols that were not defined in the libc++ shipped on
+// darwin11 and darwin12:
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <memory>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp
similarity index 85%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp
index 014a2e6..1c274d1 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak.pass.cpp
@@ -6,6 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This test uses new symbols that were not defined in the libc++ shipped on
+// darwin11 and darwin12:
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <memory>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp
similarity index 89%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp
index 3888717..7741223 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_compare_exchange_weak_explicit.pass.cpp
@@ -6,6 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This test uses new symbols that were not defined in the libc++ shipped on
+// darwin11 and darwin12:
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <memory>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp
similarity index 78%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp
index 6bda934..6e6f635 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange.pass.cpp
@@ -6,6 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This test uses new symbols that were not defined in the libc++ shipped on
+// darwin11 and darwin12:
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <memory>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp
similarity index 79%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp
index 1bc3dc7..f6a2085 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_exchange_explicit.pass.cpp
@@ -6,6 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This test uses new symbols that were not defined in the libc++ shipped on
+// darwin11 and darwin12:
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <memory>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_is_lock_free.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp
similarity index 77%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp
index ccec718..49fd1b6 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load.pass.cpp
@@ -6,6 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This test uses new symbols that were not defined in the libc++ shipped on
+// darwin11 and darwin12:
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <memory>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp
similarity index 78%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp
index 5302dad..94d0615 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_load_explicit.pass.cpp
@@ -6,6 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This test uses new symbols that were not defined in the libc++ shipped on
+// darwin11 and darwin12:
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <memory>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp
similarity index 77%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp
index a51b491..83ee45f 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store.pass.cpp
@@ -6,6 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This test uses new symbols that were not defined in the libc++ shipped on
+// darwin11 and darwin12:
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <memory>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp
similarity index 79%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp
index 0733ff4..2b3bb8b 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared.atomic/atomic_store_explicit.pass.cpp
@@ -6,6 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This test uses new symbols that were not defined in the libc++ shipped on
+// darwin11 and darwin12:
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <memory>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h
similarity index 94%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h
index 795f6e1..d9b72bc 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/test_allocator.h
@@ -54,8 +54,13 @@
     pointer allocate(size_type n, const void* = 0)
         {
             assert(data_ >= 0);
-            if (time_to_throw >= throw_after)
+            if (time_to_throw >= throw_after) {
+#ifndef _LIBCPP_NO_EXCEPTIONS
                 throw std::bad_alloc();
+#else
+                std::terminate();
+#endif
+            }
             ++time_to_throw;
             ++alloc_count;
             return (pointer)std::malloc(n * sizeof(T));
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/test_deleter.h b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/test_deleter.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/test_deleter.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/test_deleter.h
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.getdeleter/get_deleter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/auto_ptr_Y.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/auto_ptr_Y.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/auto_ptr_Y.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/auto_ptr_Y.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_Y_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/shared_ptr_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/unique_ptr_Y.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/unique_ptr_Y.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/unique_ptr_Y.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.assign/unique_ptr_Y.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/const_pointer_cast.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/const_pointer_cast.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/const_pointer_cast.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/const_pointer_cast.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/dynamic_pointer_cast.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/static_pointer_cast.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/static_pointer_cast.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/static_pointer_cast.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cast/static_pointer_cast.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp_nullptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp_nullptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp_nullptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/cmp_nullptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/lt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/lt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/lt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.cmp/lt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/weak_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/weak_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/weak_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/weak_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/allocate_shared.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.dest/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.dest/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.dest/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.dest/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/io.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/io.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/io.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.io/io.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/reset_pointer_deleter_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.mod/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/arrow.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/arrow.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/arrow.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/arrow.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/dereference.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/dereference.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/dereference.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/dereference.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bool.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bool.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bool.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bool.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_shared_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_shared_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_shared_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_shared_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_weak_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_weak_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_weak_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/owner_before_weak_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/unique.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.spec/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/owner_less.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/owner_less.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/owner_less.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/owner_less.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/shared_ptr_Y.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/shared_ptr_Y.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/shared_ptr_Y.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/shared_ptr_Y.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr_Y.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr_Y.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr_Y.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.assign/weak_ptr_Y.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_Y.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_Y.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_Y.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/shared_ptr_Y.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr_Y.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr_Y.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr_Y.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.const/weak_ptr_Y.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.dest/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.dest/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.dest/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.dest/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/reset.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/reset.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/reset.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/reset.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.mod/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/expired.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/expired.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/expired.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/expired.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/lock.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/lock.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/lock.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/lock.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/not_less_than.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/not_less_than.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/not_less_than.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/not_less_than.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_shared_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_shared_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_shared_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_shared_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_weak_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_weak_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_weak_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/owner_before_weak_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.spec/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weakptr/bad_weak_ptr.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weakptr/bad_weak_ptr.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/util.smartptr/util.smartptr.weakptr/bad_weak_ptr.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/util.smartptr/util.smartptr.weakptr/bad_weak_ptr.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/memory/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/memory/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/memory/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.hel/integral_constant.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.hel/integral_constant.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.hel/integral_constant.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.hel/integral_constant.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.rel/is_base_of.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.rel/is_base_of.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.rel/is_base_of.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.rel/is_base_of.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.rel/is_convertible.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.rel/is_convertible.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.rel/is_convertible.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.rel/is_convertible.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.rel/is_same.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.rel/is_same.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.rel/is_same.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.rel/is_same.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.rqmts/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.rqmts/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.rqmts/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.rqmts/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.arr/remove_all_extents.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.arr/remove_all_extents.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.arr/remove_all_extents.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.arr/remove_all_extents.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.arr/remove_extent.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.arr/remove_extent.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.arr/remove_extent.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.arr/remove_extent.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.cv/add_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.cv/add_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.cv/add_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.cv/add_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.cv/add_cv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.cv/add_cv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.cv/add_cv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.cv/add_cv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.cv/add_volatile.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.cv/add_volatile.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.cv/add_volatile.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.cv/add_volatile.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.cv/remove_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.cv/remove_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.cv/remove_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.cv/remove_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.cv/remove_cv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.cv/remove_cv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.cv/remove_cv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.cv/remove_cv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.cv/remove_volatile.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.cv/remove_volatile.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.cv/remove_volatile.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.cv/remove_volatile.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp
similarity index 87%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp
index 845c762..323fd5e 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/aligned_storage.pass.cpp
@@ -92,17 +92,17 @@
     }
     {
     typedef std::aligned_storage<8>::type T1;
-    static_assert(std::alignment_of<T1>::value == (sizeof(long) == 4 ? 4 : 8), "");
+    static_assert(std::alignment_of<T1>::value == 8, "");
     static_assert(sizeof(T1) == 8, "");
     }
     {
     typedef std::aligned_storage<9>::type T1;
-    static_assert(std::alignment_of<T1>::value == (sizeof(long) == 4 ? 4 : 8), "");
-    static_assert(sizeof(T1) == (sizeof(long) == 4 ? 12 : 16), "");
+    static_assert(std::alignment_of<T1>::value == 8, "");
+    static_assert(sizeof(T1) == 16, "");
     }
     {
     typedef std::aligned_storage<15>::type T1;
-    static_assert(std::alignment_of<T1>::value == (sizeof(long) == 4 ? 4 : 8), "");
+    static_assert(std::alignment_of<T1>::value == 8, "");
     static_assert(sizeof(T1) == 16, "");
     }
     {
@@ -117,7 +117,7 @@
     }
     {
     typedef std::aligned_storage<10>::type T1;
-    static_assert(std::alignment_of<T1>::value == (sizeof(long) == 4 ? 4 : 8), "");
-    static_assert(sizeof(T1) == (sizeof(long) == 4 ? 12 : 16), "");
+    static_assert(std::alignment_of<T1>::value == 8, "");
+    static_assert(sizeof(T1) == 16, "");
     }
 }
diff --git a/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/aligned_union.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/aligned_union.pass.cpp
new file mode 100644
index 0000000..b07a064
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/aligned_union.pass.cpp
@@ -0,0 +1,65 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// type_traits
+
+// aligned_union<size_t Len, class ...Types>
+
+#include <type_traits>
+
+int main()
+{
+#ifndef _LIBCPP_HAS_NO_VARIADICS
+    {
+    typedef std::aligned_union<10, char >::type T1;
+    static_assert(std::alignment_of<T1>::value == 1, "");
+    static_assert(sizeof(T1) == 10, "");
+    }
+    {
+    typedef std::aligned_union<10, short >::type T1;
+    static_assert(std::alignment_of<T1>::value == 2, "");
+    static_assert(sizeof(T1) == 10, "");
+    }
+    {
+    typedef std::aligned_union<10, int >::type T1;
+    static_assert(std::alignment_of<T1>::value == 4, "");
+    static_assert(sizeof(T1) == 12, "");
+    }
+    {
+    typedef std::aligned_union<10, double >::type T1;
+    static_assert(std::alignment_of<T1>::value == 8, "");
+    static_assert(sizeof(T1) == 16, "");
+    }
+    {
+    typedef std::aligned_union<10, short, char >::type T1;
+    static_assert(std::alignment_of<T1>::value == 2, "");
+    static_assert(sizeof(T1) == 10, "");
+    }
+    {
+    typedef std::aligned_union<10, char, short >::type T1;
+    static_assert(std::alignment_of<T1>::value == 2, "");
+    static_assert(sizeof(T1) == 10, "");
+    }
+    {
+    typedef std::aligned_union<2, int, char, short >::type T1;
+    static_assert(std::alignment_of<T1>::value == 4, "");
+    static_assert(sizeof(T1) == 4, "");
+    }
+    {
+    typedef std::aligned_union<2, char, int, short >::type T1;
+    static_assert(std::alignment_of<T1>::value == 4, "");
+    static_assert(sizeof(T1) == 4, "");
+    }
+    {
+    typedef std::aligned_union<2, char, short, int >::type T1;
+    static_assert(std::alignment_of<T1>::value == 4, "");
+    static_assert(sizeof(T1) == 4, "");
+    }
+#endif
+}
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/common_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/common_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/common_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/common_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/conditional.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/conditional.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/conditional.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/conditional.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/decay.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/decay.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/decay.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/decay.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/enable_if.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/enable_if.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/enable_if.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/enable_if.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/enable_if.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/enable_if.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/enable_if.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/enable_if.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/underlying_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/underlying_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.other/underlying_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.other/underlying_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.ptr/add_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.ptr/add_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.ptr/add_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.ptr/add_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.ptr/remove_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.ptr/remove_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.ptr/remove_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.ptr/remove_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.ref/add_lvalue_ref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.ref/add_lvalue_ref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.ref/add_lvalue_ref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.ref/add_lvalue_ref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.ref/add_rvalue_ref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.ref/add_rvalue_ref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.ref/add_rvalue_ref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.ref/add_rvalue_ref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.ref/remove_ref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.ref/remove_ref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.ref/remove_ref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.ref/remove_ref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.trans/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.trans/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.type.synop/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.type.synop/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.type.synop/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.type.synop/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
similarity index 90%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
index 87c2224..c896aa2 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
@@ -30,13 +30,13 @@
 
 int main()
 {
-    test_alignment_of<int&, sizeof(long) == 4 ? 4 : 8>();
+    test_alignment_of<int&, 4>();
     test_alignment_of<Class, 1>();
     test_alignment_of<int*, sizeof(long) == 4 ? 4 : 8>();
     test_alignment_of<const int*, sizeof(long) == 4 ? 4 : 8>();
     test_alignment_of<char[3], 1>();
     test_alignment_of<int, 4>();
-    test_alignment_of<double, sizeof(long) == 4 ? 4 : 8>();
+    test_alignment_of<double, 8>();
     test_alignment_of<bool, 1>();
     test_alignment_of<unsigned, 4>();
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary.prop.query/extent.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary.prop.query/extent.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary.prop.query/extent.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary.prop.query/extent.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary.prop.query/rank.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary.prop.query/rank.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary.prop.query/rank.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary.prop.query/rank.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/array.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/array.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/array.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/array.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/class.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/class.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/class.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/class.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/enum.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/enum.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/enum.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/enum.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/floating_point.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/floating_point.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/floating_point.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/floating_point.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/function.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/function.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/function.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/function.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/integral.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/integral.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/integral.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/integral.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/lvalue_ref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/lvalue_ref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/lvalue_ref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/lvalue_ref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/member_object_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/member_object_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/member_object_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/member_object_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/rvalue_ref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/rvalue_ref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/rvalue_ref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/rvalue_ref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/union.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/union.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/union.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/union.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/void.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/void.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.cat/void.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.cat/void.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/array.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/array.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/array.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/array.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/enum.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/enum.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/enum.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/enum.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/floating_point.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/floating_point.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/floating_point.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/floating_point.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/function.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/function.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/function.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/function.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/integral.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/integral.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/integral.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/integral.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/lvalue_ref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/lvalue_ref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/lvalue_ref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/lvalue_ref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/member_function_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/member_function_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/member_function_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/member_function_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/member_object_pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/member_object_pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/member_object_pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/member_object_pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/pointer.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/pointer.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/pointer.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/pointer.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/rvalue_ref.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/rvalue_ref.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/rvalue_ref.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/rvalue_ref.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/union.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/union.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/union.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/union.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/void.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/void.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.comp/void.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.comp/void.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/has_virtual_destructor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/has_virtual_destructor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/has_virtual_destructor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/has_virtual_destructor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_abstract.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_abstract.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_abstract.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_abstract.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_assignable.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_assignable.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_assignable.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_assignable.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_destructible.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_destructible.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_destructible.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_destructible.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_empty.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_empty.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_empty.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_empty.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_literal_type.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_literal_type.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_literal_type.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_literal_type.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_move_assignable.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_move_assignable.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_move_assignable.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_move_assignable.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_move_constructible.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_move_constructible.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_move_constructible.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_move_constructible.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_assignable.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_assignable.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_assignable.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_assignable.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_constructible.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_constructible.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_constructible.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_constructible.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_assignable.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_assignable.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_assignable.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_assignable.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_constructible.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_constructible.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_constructible.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_constructible.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_default_constructible.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_default_constructible.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_default_constructible.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_default_constructible.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_destructible.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_destructible.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_destructible.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_destructible.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_assignable.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_assignable.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_assignable.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_assignable.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_constructible.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_constructible.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_constructible.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_constructible.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_pod.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_pod.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_pod.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_pod.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp
similarity index 91%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp
index 1f4798f..62a5921 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp
@@ -52,6 +52,9 @@
     virtual ~Abstract() = 0;
 };
 
+class Final final {
+};
+
 int main()
 {
     test_is_not_polymorphic<void>();
@@ -65,6 +68,9 @@
     test_is_not_polymorphic<Union>();
     test_is_not_polymorphic<Empty>();
     test_is_not_polymorphic<bit_zero>();
+    test_is_not_polymorphic<Final>();
+    test_is_not_polymorphic<NotEmpty&>();
+    test_is_not_polymorphic<Abstract&>();
 
     test_is_polymorphic<NotEmpty>();
     test_is_polymorphic<Abstract>();
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_signed.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_signed.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_signed.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_signed.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_standard_layout.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_standard_layout.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_standard_layout.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_standard_layout.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivial.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivial.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivial.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivial.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivialially_copyable.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivialially_copyable.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivialially_copyable.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivialially_copyable.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_assignable.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_assignable.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_assignable.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_assignable.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_constructible.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_constructible.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_constructible.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_constructible.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_assignable.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_assignable.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_assignable.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_assignable.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_constructible.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_constructible.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_constructible.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_constructible.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_default_constructible.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_default_constructible.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_default_constructible.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_default_constructible.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_destructible.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_destructible.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_destructible.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_destructible.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_assignable.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_assignable.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_assignable.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_assignable.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_constructible.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_constructible.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_constructible.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_constructible.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_unsigned.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_unsigned.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_unsigned.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_unsigned.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_volatile.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_volatile.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/meta.unary.prop/is_volatile.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/meta.unary.prop/is_volatile.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/meta.unary/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/meta.unary/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/meta/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/meta/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/meta/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.arithmetic/ratio_add.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.arithmetic/ratio_add.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.arithmetic/ratio_add.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.arithmetic/ratio_add.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.arithmetic/ratio_add.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.arithmetic/ratio_add.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.arithmetic/ratio_add.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.arithmetic/ratio_add.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.arithmetic/ratio_divide.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.arithmetic/ratio_divide.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.arithmetic/ratio_divide.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.arithmetic/ratio_divide.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.arithmetic/ratio_divide.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.arithmetic/ratio_divide.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.arithmetic/ratio_divide.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.arithmetic/ratio_divide.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.arithmetic/ratio_multiply.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.arithmetic/ratio_multiply.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.arithmetic/ratio_multiply.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.arithmetic/ratio_multiply.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.arithmetic/ratio_multiply.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.arithmetic/ratio_multiply.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.arithmetic/ratio_multiply.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.arithmetic/ratio_multiply.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.arithmetic/ratio_subtract.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.arithmetic/ratio_subtract.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.arithmetic/ratio_subtract.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.arithmetic/ratio_subtract.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.arithmetic/ratio_subtract.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.arithmetic/ratio_subtract.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.arithmetic/ratio_subtract.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.arithmetic/ratio_subtract.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.comparison/ratio_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.comparison/ratio_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.comparison/ratio_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.comparison/ratio_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.comparison/ratio_greater.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.comparison/ratio_greater.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.comparison/ratio_greater.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.comparison/ratio_greater.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.comparison/ratio_greater_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.comparison/ratio_greater_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.comparison/ratio_greater_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.comparison/ratio_greater_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.comparison/ratio_less.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.comparison/ratio_less.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.comparison/ratio_less.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.comparison/ratio_less.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.comparison/ratio_less_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.comparison/ratio_less_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.comparison/ratio_less_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.comparison/ratio_less_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.comparison/ratio_not_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.comparison/ratio_not_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.comparison/ratio_not_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.comparison/ratio_not_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.ratio/ratio.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.ratio/ratio.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.ratio/ratio.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.ratio/ratio.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.ratio/ratio1.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.ratio/ratio1.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.ratio/ratio1.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.ratio/ratio1.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.ratio/ratio2.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.ratio/ratio2.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.ratio/ratio2.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.ratio/ratio2.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.ratio/ratio3.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.ratio/ratio3.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.ratio/ratio3.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.ratio/ratio3.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.si/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.si/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/ratio.si/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/ratio.si/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/typedefs.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/typedefs.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/typedefs.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/typedefs.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/ratio/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/ratio/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/ratio/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.cons/char_ptr_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.cons/char_ptr_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.cons/char_ptr_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.cons/char_ptr_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.cons/string_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.cons/string_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.cons/string_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.cons/string_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.hash/bitset.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.hash/bitset.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.hash/bitset.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.hash/bitset.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/all.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/all.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/all.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/all.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/any.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/any.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/any.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/any.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/count.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/count.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/count.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/count.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/flip_all.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/flip_all.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/flip_all.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/flip_all.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/flip_one.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/flip_one.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/flip_one.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/flip_one.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/index.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/index.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/index.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/index.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/index_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/index_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/index_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/index_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/left_shift.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/left_shift.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/left_shift.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/left_shift.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/left_shift_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/left_shift_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/left_shift_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/left_shift_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/none.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/none.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/none.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/none.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/not_all.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/not_all.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/not_all.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/not_all.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/op_and_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/op_and_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/op_and_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/op_and_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/op_eq_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/op_or_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/op_xor_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/reset_all.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/reset_all.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/reset_all.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/reset_all.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/reset_one.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/reset_one.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/reset_one.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/reset_one.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/right_shift.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/right_shift.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/right_shift.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/right_shift.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/right_shift_eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/right_shift_eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/right_shift_eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/right_shift_eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/set_all.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/set_all.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/set_all.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/set_all.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/set_one.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/set_one.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/set_one.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/set_one.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/test.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/test.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/test.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/test.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/to_string.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/to_string.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/to_string.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/to_string.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/to_ullong.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/to_ullong.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/to_ullong.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/to_ullong.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/to_ulong.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/to_ulong.pass.cpp
similarity index 92%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/to_ulong.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/to_ulong.pass.cpp
index fa62c97..3ad1aba 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.members/to_ulong.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.members/to_ulong.pass.cpp
@@ -11,6 +11,7 @@
 
 #include <bitset>
 #include <algorithm>
+#include <limits>
 #include <climits>
 #include <cassert>
 
@@ -19,7 +20,7 @@
 {
     const std::size_t M = sizeof(unsigned long) * CHAR_BIT < N ? sizeof(unsigned long) * CHAR_BIT : N;
     const std::size_t X = M == 0 ? sizeof(unsigned long) * CHAR_BIT - 1 : sizeof(unsigned long) * CHAR_BIT - M;
-    const std::size_t max = M == 0 ? 0 : std::size_t(-1) >> X;
+    const std::size_t max = M == 0 ? 0 : std::size_t(std::numeric_limits<unsigned long>::max()) >> X;
     std::size_t tests[] = {0,
                            std::min<std::size_t>(1, max),
                            std::min<std::size_t>(2, max),
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.operators/op_and.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.operators/op_and.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.operators/op_and.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.operators/op_and.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.operators/op_not.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.operators/op_not.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.operators/op_not.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.operators/op_not.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.operators/op_or.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.operators/op_or.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.operators/op_or.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.operators/op_or.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.operators/stream_in.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.operators/stream_in.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.operators/stream_in.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.operators/stream_in.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.operators/stream_out.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.operators/stream_out.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/bitset.operators/stream_out.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/bitset.operators/stream_out.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/includes.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/includes.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/includes.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/includes.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/template.bitset/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/template.bitset/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/clock.h b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/clock.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/clock.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/clock.h
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/hours.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/hours.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/hours.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/hours.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/microseconds.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/microseconds.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/microseconds.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/microseconds.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/milliseconds.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/milliseconds.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/milliseconds.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/milliseconds.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/minutes.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/minutes.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/minutes.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/minutes.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/nanoseconds.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/nanoseconds.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/nanoseconds.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/nanoseconds.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/rep.h b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/rep.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/rep.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/rep.h
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/seconds.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/seconds.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/seconds.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/seconds.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock.req/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock.req/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock.req/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock.req/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.hires/consistency.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.hires/consistency.pass.cpp
similarity index 81%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.hires/consistency.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.hires/consistency.pass.cpp
index 3abf432..848534d 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.hires/consistency.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.hires/consistency.pass.cpp
@@ -6,6 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This test uses new symbols that were not defined in the libc++ shipped on
+// darwin11 and darwin12:
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <chrono>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.hires/now.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.hires/now.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.hires/now.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.hires/now.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp
similarity index 80%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp
index 5e42dc9..bec6787 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.steady/consistency.pass.cpp
@@ -6,6 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This test uses new symbols that were not defined in the libc++ shipped on
+// darwin11 and darwin12:
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <chrono>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.steady/now.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.steady/now.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.steady/now.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.steady/now.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.system/consistency.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.system/consistency.pass.cpp
similarity index 82%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.system/consistency.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.system/consistency.pass.cpp
index 4182384..d9d6b04 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.system/consistency.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.system/consistency.pass.cpp
@@ -6,6 +6,11 @@
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+//
+// This test uses new symbols that were not defined in the libc++ shipped on
+// darwin11 and darwin12:
+// XFAIL: with_system_lib=x86_64-apple-darwin11
+// XFAIL: with_system_lib=x86_64-apple-darwin12
 
 // <chrono>
 
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.system/from_time_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.system/from_time_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.system/from_time_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.system/from_time_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.system/now.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.system/now.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.system/now.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.system/now.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.system/rep_signed.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.system/rep_signed.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.system/rep_signed.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.system/rep_signed.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.system/to_time_t.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.system/to_time_t.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.clock/time.clock.system/to_time_t.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.clock/time.clock.system/to_time_t.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/default_ratio.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/default_ratio.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/default_ratio.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/default_ratio.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/duration.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/duration.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/duration.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/duration.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/positive_num.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/positive_num.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/positive_num.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/positive_num.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/ratio.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/ratio.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/ratio.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/ratio.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_++.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_++.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_++.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_++.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_++int.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_++int.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_++int.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_++int.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_+=.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_+=.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_+=.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_+=.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_--.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_--.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_--.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_--.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_--int.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_--int.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_--int.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_--int.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_-=.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_-=.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_-=.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_-=.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_divide=.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_divide=.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_divide=.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_divide=.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_mod=duration.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_mod=duration.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_mod=duration.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_mod=duration.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_mod=rep.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_mod=rep.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_mod=rep.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_mod=rep.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_times=.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_times=.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.arithmetic/op_times=.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.arithmetic/op_times=.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cast/duration_cast.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cast/duration_cast.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cast/duration_cast.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cast/duration_cast.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cast/toduration.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cast/toduration.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cast/toduration.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cast/toduration.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.comparisons/op_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.comparisons/op_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.comparisons/op_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.comparisons/op_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.comparisons/op_less.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.comparisons/op_less.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.comparisons/op_less.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.comparisons/op_less.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/convert_exact.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/convert_exact.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/convert_exact.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/convert_exact.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/convert_float_to_int.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/convert_float_to_int.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/convert_float_to_int.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/convert_float_to_int.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/convert_inexact.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/convert_inexact.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/convert_inexact.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/convert_inexact.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/convert_inexact.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/convert_inexact.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/convert_inexact.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/convert_inexact.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/convert_int_to_float.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/convert_int_to_float.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/convert_int_to_float.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/convert_int_to_float.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/rep.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/rep.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/rep.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/rep.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/rep01.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/rep01.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/rep01.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/rep01.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/rep02.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/rep02.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/rep02.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/rep02.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/rep02.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/rep02.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/rep02.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/rep02.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/rep03.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/rep03.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.cons/rep03.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.cons/rep03.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_+.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_+.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_+.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_+.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_-.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_-.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_-.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_-.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_divide_duration.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_divide_duration.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_divide_duration.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_divide_duration.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_mod_duration.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_mod_duration.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_mod_duration.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_mod_duration.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_times_rep.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_times_rep.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_times_rep.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_times_rep.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_times_rep1.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_times_rep1.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_times_rep1.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_times_rep1.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_times_rep2.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_times_rep2.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.nonmember/op_times_rep2.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.nonmember/op_times_rep2.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.observer/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.observer/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.observer/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.observer/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.special/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.special/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.special/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.special/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.special/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.special/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.special/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.special/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.special/zero.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.special/zero.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/time.duration.special/zero.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/time.duration.special/zero.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.duration/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.duration/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/default_duration.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/default_duration.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/default_duration.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/default_duration.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/duration.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/duration.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/duration.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/duration.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.arithmetic/op_+=.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.arithmetic/op_+=.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.arithmetic/op_+=.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.arithmetic/op_+=.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.arithmetic/op_-=.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.arithmetic/op_-=.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.arithmetic/op_-=.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.arithmetic/op_-=.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.cast/toduration.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.cast/toduration.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.cast/toduration.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.cast/toduration.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.comparisons/op_equal.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.comparisons/op_equal.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.comparisons/op_equal.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.comparisons/op_equal.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.comparisons/op_less.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.comparisons/op_less.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.comparisons/op_less.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.comparisons/op_less.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.cons/convert.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.cons/convert.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.cons/convert.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.cons/convert.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.cons/convert.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.cons/convert.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.cons/convert.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.cons/convert.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.cons/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.cons/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.cons/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.cons/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.cons/duration.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.cons/duration.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.cons/duration.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.cons/duration.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.cons/duration.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.cons/duration.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.cons/duration.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.cons/duration.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.observer/tested_elsewhere.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.observer/tested_elsewhere.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.observer/tested_elsewhere.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.observer/tested_elsewhere.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.special/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.special/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.special/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.special/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.special/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.special/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.point/time.point.special/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.point/time.point.special/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.traits/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.traits/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.traits/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.traits/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.traits/time.traits.duration_values/max.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.traits/time.traits.duration_values/max.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.traits/time.traits.duration_values/max.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.traits/time.traits.duration_values/max.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.traits/time.traits.duration_values/min.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.traits/time.traits.duration_values/min.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.traits/time.traits.duration_values/min.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.traits/time.traits.duration_values/min.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.traits/time.traits.duration_values/zero.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.traits/time.traits.duration_values/zero.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.traits/time.traits.duration_values/zero.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.traits/time.traits.duration_values/zero.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.traits/time.traits.is_fp/treat_as_floating_point.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.traits/time.traits.is_fp/treat_as_floating_point.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.traits/time.traits.is_fp/treat_as_floating_point.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.traits/time.traits.is_fp/treat_as_floating_point.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.traits/time.traits.specializations/duration.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.traits/time.traits.specializations/duration.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.traits/time.traits.specializations/duration.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.traits/time.traits.specializations/duration.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/time.traits/time.traits.specializations/time_point.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.traits/time.traits.specializations/time_point.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/time.traits/time.traits.specializations/time_point.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/time.traits/time.traits.specializations/time_point.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/time/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/time/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/time/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/DefaultOnly.h b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/DefaultOnly.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/DefaultOnly.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/DefaultOnly.h
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/MoveOnly.h b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/MoveOnly.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/MoveOnly.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/MoveOnly.h
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/alloc_first.h b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/alloc_first.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/alloc_first.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/alloc_first.h
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/alloc_last.h b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/alloc_last.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/alloc_last.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/alloc_last.h
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/allocators.h b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/allocators.h
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/allocators.h
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/allocators.h
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/empty_member.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/empty_member.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/empty_member.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/empty_member.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.assign/const_pair.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/const_pair.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.assign/const_pair.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/const_pair.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.assign/convert_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/convert_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.assign/convert_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/convert_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/convert_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.assign/copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/copy.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.assign/copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/copy.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.assign/move_pair.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/move_pair.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.assign/move_pair.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.assign/move_pair.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_UTypes.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_Types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_const_pair.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_move_pair.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types2.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types2.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types2.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types2.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/const_pair.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/const_pair.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/const_pair.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/const_pair.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp
similarity index 85%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp
index 60ebd93..33aed89 100644
--- a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp
+++ b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/convert_copy.pass.cpp
@@ -67,4 +67,13 @@
         assert(std::get<1>(t1) == int('a'));
         assert(std::get<2>(t1).id_ == 2);
     }
+    {
+        typedef std::tuple<double, char, int> T0;
+        typedef std::tuple<int, int, B> T1;
+        T0 t0(2.5, 'a', 3);
+        T1 t1(t0);
+        assert(std::get<0>(t1) == 2);
+        assert(std::get<1>(t1) == int('a'));
+        assert(std::get<2>(t1).id_ == 3);
+    }
 }
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/convert_move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/convert_move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/convert_move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/convert_move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/copy.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/copy.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/copy.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/copy.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/move_pair.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/move_pair.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.cnstr/move_pair.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.cnstr/move_pair.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.creation/tie.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/tie.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.creation/tie.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/tie.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.elem/get_const.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/get_const.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.elem/get_const.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/get_const.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.elem/get_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/get_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.elem/get_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/get_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.elem/get_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/get_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.elem/get_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/get_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.elem/get_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/get_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.elem/get_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.elem/get_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.helper/tuple_element.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.helper/tuple_element.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.helper/tuple_element.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.helper/tuple_element.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.helper/tuple_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.helper/tuple_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.helper/tuple_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.helper/tuple_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.special/non_member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.swap/member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.traits/uses_allocator.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.traits/uses_allocator.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/tuple.tuple/tuple.traits/uses_allocator.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/tuple.tuple/tuple.traits/uses_allocator.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/tuple/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/tuple/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/tuple/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.hash/hash.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.hash/hash.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.hash/hash.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.hash/hash.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.members/ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.members/ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.members/ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.members/ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.members/eq.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.members/eq.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.members/eq.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.members/eq.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.members/hash_code.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.members/hash_code.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.members/hash_code.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.members/hash_code.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.members/lt.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.members/lt.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.members/lt.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.members/lt.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.members/name.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.members/name.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.members/name.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.members/name.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.overview/copy_assign.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.overview/copy_assign.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.overview/copy_assign.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.overview/copy_assign.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.overview/copy_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.overview/copy_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.overview/copy_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.overview/copy_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/type.index/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/type.index/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/type.index/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utilities.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utilities.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utilities.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utilities.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility.requirements/allocator.requirements/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility.requirements/allocator.requirements/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility.requirements/allocator.requirements/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility.requirements/allocator.requirements/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility.requirements/hash.requirements/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility.requirements/hash.requirements/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility.requirements/hash.requirements/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility.requirements/hash.requirements/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility.requirements/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility.requirements/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility.requirements/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility.requirements/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility.requirements/nullablepointer.requirements/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility.requirements/nullablepointer.requirements/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility.requirements/nullablepointer.requirements/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility.requirements/nullablepointer.requirements/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility.requirements/swappable.requirements/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility.requirements/swappable.requirements/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility.requirements/swappable.requirements/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility.requirements/swappable.requirements/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility.requirements/utility.arg.requirements/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility.requirements/utility.arg.requirements/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility.requirements/utility.arg.requirements/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility.requirements/utility.arg.requirements/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/declval/declval.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/declval/declval.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/declval/declval.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/declval/declval.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/forward.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/forward.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/forward.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/forward.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/forward1.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/forward1.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/forward1.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/forward1.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/forward2.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/forward2.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/forward2.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/forward2.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/forward3.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/forward3.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/forward3.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/forward3.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/forward4.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/forward4.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/forward4.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/forward4.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/forward5.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/forward5.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/forward5.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/forward5.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/forward6.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/forward6.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/forward6.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/forward6.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/move_copy.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/move_copy.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/move_copy.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/move_copy.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/move_if_noexcept.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/move_if_noexcept.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/move_if_noexcept.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/move_if_noexcept.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/move_only.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/move_only.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/move_only.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/move_only.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/move_only1.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/move_only1.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/move_only1.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/move_only1.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/move_only2.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/move_only2.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/move_only2.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/move_only2.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/move_only3.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/move_only3.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/move_only3.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/move_only3.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/move_only4.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/move_only4.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/forward/move_only4.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/forward/move_only4.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/operators/rel_ops.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/operators/rel_ops.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/operators/rel_ops.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/operators/rel_ops.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pair.astuple/get_const.fail.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pair.astuple/get_const.fail.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pair.astuple/get_const.fail.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pair.astuple/get_const.fail.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pair.astuple/get_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pair.astuple/get_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pair.astuple/get_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pair.astuple/get_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pair.astuple/get_non_const.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pair.astuple/get_non_const.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pair.astuple/get_non_const.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pair.astuple/get_non_const.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pair.astuple/get_rv.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pair.astuple/get_rv.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pair.astuple/get_rv.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pair.astuple/get_rv.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pair.astuple/tuple_element.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pair.astuple/tuple_element.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pair.astuple/tuple_element.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pair.astuple/tuple_element.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pair.astuple/tuple_size.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pair.astuple/tuple_size.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pair.astuple/tuple_size.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pair.astuple/tuple_size.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pair.piecewise/piecewise_construct.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pair.piecewise/piecewise_construct.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pair.piecewise/piecewise_construct.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pair.piecewise/piecewise_construct.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.general/nothing_to_do.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.general/nothing_to_do.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.general/nothing_to_do.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.general/nothing_to_do.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/U_V.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/U_V.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/U_V.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/U_V.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/assign_const_pair_U_V.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/assign_const_pair_U_V.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/assign_const_pair_U_V.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/assign_const_pair_U_V.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/assign_rv_pair.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/copy_ctor.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/copy_ctor.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/copy_ctor.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/copy_ctor.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/default.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/default.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/default.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/default.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/piecewise.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/piecewise.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/piecewise.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/piecewise.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/types.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/types.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.pair/types.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.pair/types.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.spec/comparison.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.spec/comparison.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.spec/comparison.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.spec/comparison.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.spec/make_pair.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.spec/make_pair.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.spec/make_pair.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.spec/make_pair.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.spec/non_member_swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.spec/non_member_swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/pairs/pairs.spec/non_member_swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/pairs/pairs.spec/non_member_swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/utility.swap/swap.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/utility.swap/swap.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/utility.swap/swap.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/utility.swap/swap.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/utility.swap/swap_array.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/utility.swap/swap_array.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/utility.swap/swap_array.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/utility.swap/swap_array.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/utility/version.pass.cpp b/sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/version.pass.cpp
similarity index 100%
rename from sources/cxx-stl/llvm-libc++/test/utilities/utility/version.pass.cpp
rename to sources/cxx-stl/llvm-libc++/libcxx/test/utilities/utility/version.pass.cpp
diff --git a/sources/cxx-stl/llvm-libc++/patches.android/0001-Support-building-with-GCC-4.6.patch b/sources/cxx-stl/llvm-libc++/patches.android/0001-Support-building-with-GCC-4.6.patch
new file mode 100644
index 0000000..53de86a
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/patches.android/0001-Support-building-with-GCC-4.6.patch
@@ -0,0 +1,38 @@
+From 844d415e957adccad5617628063ee07bea00489e Mon Sep 17 00:00:00 2001
+From: David 'Digit' Turner <digit@google.com>
+Date: Thu, 2 May 2013 14:10:19 +0200
+Subject: Support building with GCC 4.6
+
+---
+ include/__config | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/include/__config b/include/__config
+index 389b6c4..9463008 100644
+--- a/include/__config
++++ b/include/__config
+@@ -346,6 +346,10 @@ namespace std {
+ #define _LIBCPP_HAS_NO_STATIC_ASSERT
+ #endif
+ 
++#if _GNUC_VER < 407
++#define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
++#endif
++
+ #if _GNUC_VER < 404
+ #define _LIBCPP_HAS_NO_ADVANCED_SFINAE
+ #define _LIBCPP_HAS_NO_DECLTYPE
+@@ -362,6 +366,10 @@ namespace std {
+ 
+ #endif  // __GXX_EXPERIMENTAL_CXX0X__
+ 
++#if _GNUC_VER > 403
++#define _LIBCP_HAS_IS_BASE_OF
++#endif
++
+ #define _LIBCPP_BEGIN_NAMESPACE_STD namespace std { namespace _LIBCPP_NAMESPACE {
+ #define _LIBCPP_END_NAMESPACE_STD  } }
+ #define _VSTD std::_LIBCPP_NAMESPACE
+-- 
+1.7.12.146.g16d26b1
+
diff --git a/sources/cxx-stl/llvm-libc++/patches.android/0002-include-regex-Support-building-with-GCC-4.6.patch b/sources/cxx-stl/llvm-libc++/patches.android/0002-include-regex-Support-building-with-GCC-4.6.patch
new file mode 100644
index 0000000..f938f40
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/patches.android/0002-include-regex-Support-building-with-GCC-4.6.patch
@@ -0,0 +1,39 @@
+From e42fed799f625e8cb8c552d7be595242ebcc2739 Mon Sep 17 00:00:00 2001
+From: David 'Digit' Turner <digit@google.com>
+Date: Thu, 2 May 2013 14:11:11 +0200
+Subject: include/regex: Support building with GCC 4.6
+
+---
+ include/regex | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/include/regex b/include/regex
+index d1afa54..20818b6 100644
+--- a/include/regex
++++ b/include/regex
+@@ -933,7 +933,7 @@ public:
+     typedef locale                  locale_type;
+     typedef ctype_base::mask        char_class_type;
+ 
+-    static const char_class_type __regex_word = 0x80;
++    static const char_class_type __regex_word;
+ private:
+     locale __loc_;
+     const ctype<char_type>* __ct_;
+@@ -1008,9 +1008,13 @@ private:
+     int __value(wchar_t __ch, int __radix) const;
+ };
+ 
++template <class _CharT> const typename regex_traits<_CharT>::char_class_type regex_traits<_CharT>::__regex_word = 0x80;
++
++#if 0
+ template <class _CharT>
+ const typename regex_traits<_CharT>::char_class_type
+ regex_traits<_CharT>::__regex_word;
++#endif
+ 
+ template <class _CharT>
+ regex_traits<_CharT>::regex_traits()
+-- 
+1.7.12.146.g16d26b1
+
diff --git a/sources/cxx-stl/llvm-libc++/patches.android/0003-src-new.cpp-Support-building-with-GAbi.patch b/sources/cxx-stl/llvm-libc++/patches.android/0003-src-new.cpp-Support-building-with-GAbi.patch
new file mode 100644
index 0000000..c2dc2a4
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/patches.android/0003-src-new.cpp-Support-building-with-GAbi.patch
@@ -0,0 +1,64 @@
+From f5d1187b1ea38969dd4de6607a7fa9ed9fae94c6 Mon Sep 17 00:00:00 2001
+From: David 'Digit' Turner <digit@google.com>
+Date: Thu, 2 May 2013 14:11:53 +0200
+Subject: src/new.cpp: Support building with GAbi++
+
+---
+ src/new.cpp | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/new.cpp b/src/new.cpp
+index b23a516..cf1d3c0 100644
+--- a/src/new.cpp
++++ b/src/new.cpp
+@@ -144,15 +144,19 @@ operator delete[] (void* ptr, const std::nothrow_t&) _NOEXCEPT
+ namespace std
+ {
+ 
++#ifndef GABIXX_LIBCXX
+ const nothrow_t nothrow = {};
++#endif
+ 
+-#ifndef _LIBCPPABI_VERSION
++#if !defined(_LIBCPPABI_VERSION)
+ 
++#if !defined(GABIXX_LIBCXX)
+ new_handler
+ set_new_handler(new_handler handler) _NOEXCEPT
+ {
+     return __sync_lock_test_and_set(&__new_handler, handler);
+ }
++#endif
+ 
+ new_handler
+ get_new_handler() _NOEXCEPT
+@@ -160,7 +164,7 @@ get_new_handler() _NOEXCEPT
+     return __sync_fetch_and_add(&__new_handler, (new_handler)0);
+ }
+ 
+-#ifndef LIBCXXRT
++#if !defined(LIBCXXRT)
+ 
+ bad_alloc::bad_alloc() _NOEXCEPT
+ {
+@@ -176,7 +180,7 @@ bad_alloc::what() const _NOEXCEPT
+     return "std::bad_alloc";
+ }
+ 
+-#endif //LIBCXXRT
++#endif // !LIBCXXRT
+ 
+ bad_array_new_length::bad_array_new_length() _NOEXCEPT
+ {
+@@ -192,7 +196,7 @@ bad_array_new_length::what() const _NOEXCEPT
+     return "bad_array_new_length";
+ }
+ 
+-#endif
++#endif // !_LIBCPPABI_VERSION && !GABIXX_LIBCXX
+ 
+ void
+ __throw_bad_alloc()
+-- 
+1.7.12.146.g16d26b1
+
diff --git a/sources/cxx-stl/llvm-libc++/patches.android/0004-locale-Support-for-Android.patch b/sources/cxx-stl/llvm-libc++/patches.android/0004-locale-Support-for-Android.patch
new file mode 100644
index 0000000..d6127b8
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/patches.android/0004-locale-Support-for-Android.patch
@@ -0,0 +1,54 @@
+From 0d7f6c7dbf3707c82bc739d7a676e3d322b18813 Mon Sep 17 00:00:00 2001
+From: David 'Digit' Turner <digit@google.com>
+Date: Thu, 2 May 2013 14:12:35 +0200
+Subject: locale: Support for Android.
+
+---
+ include/__locale | 14 ++++++++++++++
+ src/locale.cpp   |  5 +++++
+ 2 files changed, 19 insertions(+)
+
+diff --git a/include/__locale b/include/__locale
+index 24d565b..8c93b71 100644
+--- a/include/__locale
++++ b/include/__locale
+@@ -369,6 +369,20 @@ public:
+     static const mask punct  = _ISPUNCT;
+     static const mask xdigit = _ISXDIGIT;
+     static const mask blank  = _ISBLANK;
++#elif defined(__ANDROID__)
++    typedef char mask;
++    static const mask space  = _S;
++    static const mask print  = _P | _U | _L | _N | _B;
++    static const mask cntrl  = _C;
++    static const mask upper  = _U;
++    static const mask lower  = _L;
++    static const mask alpha  = _U | _L;
++    static const mask digit  = _N;
++    static const mask punct  = _P;
++    static const mask xdigit = _N | _X;
++
++    // TODO(ajwong): bionic doesn't have a blank mask
++    static const mask blank  = 0;
+ #else  // __GLIBC__ || _WIN32 || __APPLE__ || __FreeBSD__ || EMSCRIPTEN || __sun__
+     typedef unsigned long mask;
+     static const mask space  = 1<<0;
+diff --git a/src/locale.cpp b/src/locale.cpp
+index 49c1cf2..5667f8d 100644
+--- a/src/locale.cpp
++++ b/src/locale.cpp
+@@ -991,6 +991,11 @@ ctype<char>::classic_table()  _NOEXCEPT
+     return _DefaultRuneLocale.__runetype;
+ #elif defined(__GLIBC__)
+     return __cloc()->__ctype_b;
++#elif defined(__ANDROID__)
++    // TODO(ajwong): Should the actual traits functions delegate to the
++    // bionic ctype variants? Or should we do something similar to how we
++    // handle glibc where we use the _tolower_tab_ and _toupper_tab_ directly?
++    return __ctype_c_mask_table;
+ #elif __sun__
+     return __ctype_mask;
+ #elif defined(_WIN32)
+-- 
+1.7.12.146.g16d26b1
+
diff --git a/sources/cxx-stl/llvm-libc++/src/support/win32/support.cpp b/sources/cxx-stl/llvm-libc++/src/support/win32/support.cpp
deleted file mode 100644
index 9e85077..0000000
--- a/sources/cxx-stl/llvm-libc++/src/support/win32/support.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-//===----------------------- support/win32/support.h ----------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include <support/win32/support.h>
-#include <stdarg.h> // va_start, va_end
-#include <stddef.h> // size_t
-#include <stdlib.h> // malloc
-#include <stdio.h>  // vsprintf, vsnprintf
-#include <string.h> // strcpy, wcsncpy
-
-int asprintf(char **sptr, const char *__restrict fmt, ...)
-{
-    va_list ap;
-    va_start(ap, fmt);
-    int result = vasprintf(sptr, fmt, ap);
-    va_end(ap);
-    return result;
-}
-int vasprintf( char **sptr, const char *__restrict fmt, va_list ap )
-{
-    *sptr = NULL;
-    int count = vsnprintf( *sptr, 0, fmt, ap );
-    if( (count >= 0) && ((*sptr = (char*)malloc(count+1)) != NULL) )
-    {
-        vsprintf( *sptr, fmt, ap );
-        sptr[count] = '\0';
-    }
-
-    return count;
-}
-
-// FIXME: use wcrtomb and avoid copy
-// use mbsrtowcs which is available, first copy first nwc elements of src
-size_t mbsnrtowcs( wchar_t *__restrict dst, const char **__restrict src,
-                   size_t nmc, size_t len, mbstate_t *__restrict ps )
-{
-    char* local_src = new char[nmc+1];
-    char* nmcsrc = local_src;
-    strncpy( nmcsrc, *src, nmc );
-    nmcsrc[nmc] = '\0';
-    const size_t result = mbsrtowcs( dst, const_cast<const char **>(&nmcsrc), len, ps );
-    // propagate error
-    if( nmcsrc == NULL )
-        *src = NULL;
-    delete[] local_src;
-    return result;
-}
-// FIXME: use wcrtomb and avoid copy
-// use wcsrtombs which is available, first copy first nwc elements of src
-size_t wcsnrtombs( char *__restrict dst, const wchar_t **__restrict src,
-                   size_t nwc, size_t len, mbstate_t *__restrict ps )
-{
-    wchar_t* local_src = new wchar_t[nwc];
-    wchar_t* nwcsrc = local_src;
-    wcsncpy(nwcsrc, *src, nwc);
-    nwcsrc[nwc] = '\0';
-    const size_t result = wcsrtombs( dst, const_cast<const wchar_t **>(&nwcsrc), len, ps );
-    // propogate error
-    if( nwcsrc == NULL )
-        *src = NULL;
-    delete[] nwcsrc;
-    return result;
-}
diff --git a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.cons/string.pass.cpp b/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.cons/string.pass.cpp
deleted file mode 100644
index 67dd02a..0000000
--- a/sources/cxx-stl/llvm-libc++/test/input.output/file.streams/fstreams/ofstream.cons/string.pass.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <fstream>
-
-// template <class charT, class traits = char_traits<charT> >
-// class basic_ofstream
-
-// explicit basic_ofstream(const string& s, ios_base::openmode mode = ios_base::out);
-
-#include <fstream>
-#include <cassert>
-
-int main()
-{
-    char temp[L_tmpnam];
-    tmpnam(temp);
-    {
-        std::ofstream fs((std::string(temp)));
-        fs << 3.25;
-    }
-    {
-        std::ifstream fs((std::string(temp)));
-        double x = 0;
-        fs >> x;
-        assert(x == 3.25);
-    }
-    remove(temp);
-    {
-        std::wofstream fs((std::string(temp)));
-        fs << 3.25;
-    }
-    {
-        std::wifstream fs((std::string(temp)));
-        double x = 0;
-        fs >> x;
-        assert(x == 3.25);
-    }
-    remove(temp);
-}
diff --git a/sources/cxx-stl/llvm-libc++/test/lit.cfg b/sources/cxx-stl/llvm-libc++/test/lit.cfg
deleted file mode 100644
index dc843ac..0000000
--- a/sources/cxx-stl/llvm-libc++/test/lit.cfg
+++ /dev/null
@@ -1,187 +0,0 @@
-# -*- Python -*-
-
-# Configuration file for the 'lit' test runner.
-
-import os
-import sys
-import platform
-import tempfile
-import signal
-import subprocess
-import errno
-import time
-
-class LibcxxTestFormat(lit.formats.FileBasedTest):
-    """
-    Custom test format handler for use with the test format use by libc++.
-
-    Tests fall into two categories:
-      FOO.pass.cpp - Executable test which should compile, run, and exit with
-                     code 0.
-      FOO.fail.cpp - Negative test case which is expected to fail compilation.
-    """
-
-    def __init__(self, cxx_under_test, cpp_flags, ld_flags):
-        self.cxx_under_test = cxx_under_test
-        self.cpp_flags = list(cpp_flags)
-        self.ld_flags = list(ld_flags)
-
-    def execute_command(self, command, in_dir=None):
-        kwargs = {
-            'stdin' :subprocess.PIPE,
-            'stdout':subprocess.PIPE,
-            'stderr':subprocess.PIPE,
-        }
-        if in_dir:
-            kwargs['cwd'] = in_dir
-        p = subprocess.Popen(command, **kwargs)
-        out,err = p.communicate()
-        exitCode = p.wait()
-
-        # Detect Ctrl-C in subprocess.
-        if exitCode == -signal.SIGINT:
-            raise KeyboardInterrupt
-
-        return out, err, exitCode
-
-    def execute(self, test, lit_config):
-        while True:
-            try:
-                return self._execute(test, lit_config)
-            except OSError, oe:
-                if oe.errno != errno.ETXTBSY:
-                    raise
-                time.sleep(0.1)
-
-    def _execute(self, test, lit_config):
-        name = test.path_in_suite[-1]
-        source_path = test.getSourcePath()
-        source_dir = os.path.dirname(source_path)
-
-        # Check what kind of test this is.
-        assert name.endswith('.pass.cpp') or name.endswith('.fail.cpp')
-        expected_compile_fail = name.endswith('.fail.cpp')
-
-        # If this is a compile (failure) test, build it and check for failure.
-        if expected_compile_fail:
-            cmd = [self.cxx_under_test, '-c',
-                   '-o', '/dev/null', source_path] + self.cpp_flags
-            out, err, exitCode = self.execute_command(cmd)
-            if exitCode == 1:
-                return lit.Test.PASS, ""
-            else:
-                report = """Command: %s\n""" % ' '.join(["'%s'" % a
-                                                         for a in cmd])
-                report += """Exit Code: %d\n""" % exitCode
-                if out:
-                    report += """Standard Output:\n--\n%s--""" % out
-                if err:
-                    report += """Standard Error:\n--\n%s--""" % err
-                report += "\n\nExpected compilation to fail!"
-                return lit.Test.FAIL, report
-        else:
-            exec_file = tempfile.NamedTemporaryFile(suffix="exe", delete=False)
-            exec_path = exec_file.name
-            exec_file.close()
-
-            try:
-                compile_cmd = [self.cxx_under_test, '-o', exec_path,
-                       source_path] + self.cpp_flags + self.ld_flags
-                cmd = compile_cmd
-                out, err, exitCode = self.execute_command(cmd)
-                if exitCode != 0:
-                    report = """Command: %s\n""" % ' '.join(["'%s'" % a
-                                                             for a in cmd])
-                    report += """Exit Code: %d\n""" % exitCode
-                    if out:
-                        report += """Standard Output:\n--\n%s--""" % out
-                    if err:
-                        report += """Standard Error:\n--\n%s--""" % err
-                    report += "\n\nCompilation failed unexpectedly!"
-                    return lit.Test.FAIL, report
-
-                cmd = [exec_path]
-                if lit_config.useValgrind:
-                    cmd = lit_config.valgrindArgs + cmd
-                out, err, exitCode = self.execute_command(cmd, source_dir)
-                if exitCode != 0:
-                    report = """Compiled With: %s\n""" % ' '.join(["'%s'" % a
-                                                                   for a in compile_cmd])
-                    report += """Command: %s\n""" % ' '.join(["'%s'" % a
-                                                             for a in cmd])
-                    report += """Exit Code: %d\n""" % exitCode
-                    if out:
-                        report += """Standard Output:\n--\n%s--""" % out
-                    if err:
-                        report += """Standard Error:\n--\n%s--""" % err
-                    report += "\n\nCompiled test failed unexpectedly!"
-                    return lit.Test.FAIL, report
-            finally:
-                try:
-                    os.remove(exec_path)
-                except:
-                    pass
-        return lit.Test.PASS, ""
-
-# name: The name of this test suite.
-config.name = 'libc++'
-
-# suffixes: A list of file extensions to treat as test files.
-config.suffixes = ['.cpp']
-
-# test_source_root: The root path where tests are located.
-config.test_source_root = os.path.dirname(__file__)
-
-# Gather various compiler parameters.
-cxx_under_test = lit.params.get('cxx_under_test', None)
-if cxx_under_test is None:
-    cxx_under_test = getattr(config, 'cxx_under_test', None)
-    if cxx_under_test is None:
-        lit.fatal('must specify user parameter cxx_under_test '
-                  '(e.g., --param=cxx_under_test=clang++)')
-
-libcxx_src_root = lit.params.get('libcxx_src_root', None)
-if libcxx_src_root is None:
-    libcxx_src_root = getattr(config, 'libcxx_src_root', None)
-    if libcxx_src_root is None:
-        libcxx_src_root = os.path.dirname(config.test_source_root)
-
-libcxx_obj_root = lit.params.get('libcxx_obj_root', None)
-if libcxx_obj_root is None:
-    libcxx_obj_root = getattr(config, 'libcxx_obj_root', None)
-    if libcxx_obj_root is None:
-        libcxx_obj_root = libcxx_src_root
-
-cxx_has_stdcxx0x_flag_str = lit.params.get('cxx_has_stdcxx0x_flag', None)
-if cxx_has_stdcxx0x_flag_str is not None:
-    if cxx_has_stdcxx0x_flag_str in ('1', 'True'):
-        cxx_has_stdcxx0x_flag = True
-    elif cxx_has_stdcxx0x_flag_str in ('', '0', 'False'):
-        cxx_has_stdcxx0x_flag = False
-    else:
-        lit.fatal('user parameter cxx_has_stdcxx0x_flag_str should be 0 or 1')
-else:
-    cxx_has_stdcxx0x_flag = getattr(config, 'cxx_has_stdcxx0x_flag', True)
-
-# Configure extra compiler flags.
-include_paths = ['-I' + libcxx_src_root + '/include', '-I' + libcxx_src_root + '/test/support']
-library_paths = ['-L' + libcxx_obj_root + '/lib']
-compile_flags = []
-if cxx_has_stdcxx0x_flag:
-  compile_flags += ['-std=c++0x']
-
-# Configure extra libraries.
-libraries = []
-if sys.platform == 'darwin':
-  libraries += ['-lSystem']
-if sys.platform == 'linux2':
-  libraries += ['-lsupc++', '-lgcc_eh', '-lc', '-lm', '-lpthread', '-lrt', '-lgcc_s']
-  libraries += ['-Wl,-R', libcxx_obj_root + '/lib']
-  compile_flags += ['-D__STDC_FORMAT_MACROS', '-D__STDC_LIMIT_MACROS', '-D__STDC_CONSTANT_MACROS']
-
-config.test_format = LibcxxTestFormat(
-    cxx_under_test,
-    cpp_flags = ['-nostdinc++'] + compile_flags + include_paths,
-    ld_flags = ['-nodefaultlibs'] + library_paths + ['-lc++'] + libraries)
-
-config.target_triple = None
diff --git a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp b/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp
deleted file mode 100644
index 673f8dc..0000000
--- a/sources/cxx-stl/llvm-libc++/test/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long_double.pass.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <locale>
-
-// class num_get<charT, InputIterator>
-
-// iter_type get(iter_type in, iter_type end, ios_base&,
-//               ios_base::iostate& err, long double& v) const;
-
-#include <locale>
-#include <ios>
-#include <cassert>
-#include <streambuf>
-#include <cmath>
-#include "test_iterators.h"
-#include "hexfloat.h"
-
-typedef std::num_get<char, input_iterator<const char*> > F;
-
-class my_facet
-    : public F
-{
-public:
-    explicit my_facet(std::size_t refs = 0)
-        : F(refs) {}
-};
-
-int main()
-{
-    const my_facet f(1);
-    std::ios ios(0);
-    long double v = -1;
-    {
-        const char str[] = "123";
-        assert((ios.flags() & ios.basefield) == ios.dec);
-        assert(ios.getloc().name() == "C");
-        std::ios_base::iostate err = ios.goodbit;
-        input_iterator<const char*> iter =
-            f.get(input_iterator<const char*>(str),
-                  input_iterator<const char*>(str+sizeof(str)),
-                  ios, err, v);
-        assert(iter.base() == str+sizeof(str)-1);
-        assert(err == ios.goodbit);
-        assert(v == 123);
-    }
-    {
-        const char str[] = "-123";
-        std::ios_base::iostate err = ios.goodbit;
-        input_iterator<const char*> iter =
-            f.get(input_iterator<const char*>(str),
-                  input_iterator<const char*>(str+sizeof(str)),
-                  ios, err, v);
-        assert(iter.base() == str+sizeof(str)-1);
-        assert(err == ios.goodbit);
-        assert(v == -123);
-    }
-    {
-        const char str[] = "123.5";
-        std::ios_base::iostate err = ios.goodbit;
-        input_iterator<const char*> iter =
-            f.get(input_iterator<const char*>(str),
-                  input_iterator<const char*>(str+sizeof(str)),
-                  ios, err, v);
-        assert(iter.base() == str+sizeof(str)-1);
-        assert(err == ios.goodbit);
-        assert(v == 123.5);
-    }
-    {
-        const char str[] = "125e-1";
-        hex(ios);
-        std::ios_base::iostate err = ios.goodbit;
-        input_iterator<const char*> iter =
-            f.get(input_iterator<const char*>(str),
-                  input_iterator<const char*>(str+sizeof(str)),
-                  ios, err, v);
-        assert(iter.base() == str+sizeof(str)-1);
-        assert(err == ios.goodbit);
-        assert(v == 125e-1);
-    }
-    {
-        const char str[] = "0x125p-1";
-        hex(ios);
-        std::ios_base::iostate err = ios.goodbit;
-        input_iterator<const char*> iter =
-            f.get(input_iterator<const char*>(str),
-                  input_iterator<const char*>(str+sizeof(str)),
-                  ios, err, v);
-        assert(iter.base() == str+sizeof(str)-1);
-        assert(err == ios.goodbit);
-        assert(v == hexfloat<long double>(0x125, 0, -1));
-    }
-    {
-        const char str[] = "inf";
-        hex(ios);
-        std::ios_base::iostate err = ios.goodbit;
-        input_iterator<const char*> iter =
-            f.get(input_iterator<const char*>(str),
-                  input_iterator<const char*>(str+sizeof(str)),
-                  ios, err, v);
-        assert(iter.base() == str+sizeof(str)-1);
-        assert(err == ios.goodbit);
-        assert(v == INFINITY);
-    }
-    {
-        const char str[] = "INF";
-        hex(ios);
-        std::ios_base::iostate err = ios.goodbit;
-        input_iterator<const char*> iter =
-            f.get(input_iterator<const char*>(str),
-                  input_iterator<const char*>(str+sizeof(str)),
-                  ios, err, v);
-        assert(iter.base() == str+sizeof(str)-1);
-        assert(err == ios.goodbit);
-        assert(v == INFINITY);
-    }
-    {
-        const char str[] = "-inf";
-        hex(ios);
-        std::ios_base::iostate err = ios.goodbit;
-        input_iterator<const char*> iter =
-            f.get(input_iterator<const char*>(str),
-                  input_iterator<const char*>(str+sizeof(str)),
-                  ios, err, v);
-        assert(iter.base() == str+sizeof(str)-1);
-        assert(err == ios.goodbit);
-        assert(v == -INFINITY);
-    }
-    {
-        const char str[] = "-INF";
-        hex(ios);
-        std::ios_base::iostate err = ios.goodbit;
-        input_iterator<const char*> iter =
-            f.get(input_iterator<const char*>(str),
-                  input_iterator<const char*>(str+sizeof(str)),
-                  ios, err, v);
-        assert(iter.base() == str+sizeof(str)-1);
-        assert(err == ios.goodbit);
-        assert(v == -INFINITY);
-    }
-    {
-        const char str[] = "nan";
-        hex(ios);
-        std::ios_base::iostate err = ios.goodbit;
-        input_iterator<const char*> iter =
-            f.get(input_iterator<const char*>(str),
-                  input_iterator<const char*>(str+sizeof(str)),
-                  ios, err, v);
-        assert(iter.base() == str+sizeof(str)-1);
-        assert(err == ios.goodbit);
-        assert(std::isnan(v));
-    }
-    {
-        const char str[] = "NAN";
-        hex(ios);
-        std::ios_base::iostate err = ios.goodbit;
-        input_iterator<const char*> iter =
-            f.get(input_iterator<const char*>(str),
-                  input_iterator<const char*>(str+sizeof(str)),
-                  ios, err, v);
-        assert(iter.base() == str+sizeof(str)-1);
-        assert(err == ios.goodbit);
-        assert(std::isnan(v));
-    }
-}
diff --git a/sources/cxx-stl/llvm-libc++/test/re/test_allocator.h b/sources/cxx-stl/llvm-libc++/test/re/test_allocator.h
deleted file mode 100644
index c5da7e6..0000000
--- a/sources/cxx-stl/llvm-libc++/test/re/test_allocator.h
+++ /dev/null
@@ -1,112 +0,0 @@
-#ifndef TEST_ALLOCATOR_H
-#define TEST_ALLOCATOR_H
-
-#include <cstddef>
-#include <type_traits>
-#include <cstdlib>
-#include <new>
-#include <climits>
-
-class test_alloc_base
-{
-protected:
-    static int count;
-public:
-    static int throw_after;
-};
-
-int test_alloc_base::count = 0;
-int test_alloc_base::throw_after = INT_MAX;
-
-template <class T>
-class test_allocator
-    : public test_alloc_base
-{
-    int data_;
-
-    template <class U> friend class test_allocator;
-public:
-
-    typedef unsigned                                                   size_type;
-    typedef int                                                        difference_type;
-    typedef T                                                          value_type;
-    typedef value_type*                                                pointer;
-    typedef const value_type*                                          const_pointer;
-    typedef typename std::add_lvalue_reference<value_type>::type       reference;
-    typedef typename std::add_lvalue_reference<const value_type>::type const_reference;
-
-    template <class U> struct rebind {typedef test_allocator<U> other;};
-
-    test_allocator() throw() : data_(-1) {}
-    explicit test_allocator(int i) throw() : data_(i) {}
-    test_allocator(const test_allocator& a) throw()
-        : data_(a.data_) {}
-    template <class U> test_allocator(const test_allocator<U>& a) throw()
-        : data_(a.data_) {}
-    ~test_allocator() throw() {data_ = 0;}
-    pointer address(reference x) const {return &x;}
-    const_pointer address(const_reference x) const {return &x;}
-    pointer allocate(size_type n, const void* = 0)
-        {
-            if (count >= throw_after)
-                throw std::bad_alloc();
-            ++count;
-            return (pointer)std::malloc(n * sizeof(T));
-        }
-    void deallocate(pointer p, size_type n)
-        {std::free(p);}
-    size_type max_size() const throw()
-        {return UINT_MAX / sizeof(T);}
-    void construct(pointer p, const T& val)
-        {::new(p) T(val);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void construct(pointer p, T&& val)
-        {::new(p) T(std::move(val));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void destroy(pointer p) {p->~T();}
-
-    friend bool operator==(const test_allocator& x, const test_allocator& y)
-        {return x.data_ == y.data_;}
-    friend bool operator!=(const test_allocator& x, const test_allocator& y)
-        {return !(x == y);}
-};
-
-template <class T>
-class other_allocator
-{
-    int data_;
-
-    template <class U> friend class other_allocator;
-
-public:
-    typedef T value_type;
-
-    other_allocator() : data_(-1) {}
-    explicit other_allocator(int i) : data_(i) {}
-    template <class U> other_allocator(const other_allocator<U>& a)
-        : data_(a.data_) {}
-    T* allocate(std::size_t n)
-        {return (T*)std::malloc(n * sizeof(T));}
-    void deallocate(T* p, std::size_t n)
-        {std::free(p);}
-
-    other_allocator select_on_container_copy_construction() const
-        {return other_allocator(-2);}
-
-    friend bool operator==(const other_allocator& x, const other_allocator& y)
-        {return x.data_ == y.data_;}
-    friend bool operator!=(const other_allocator& x, const other_allocator& y)
-        {return !(x == y);}
-
-    typedef std::true_type propagate_on_container_copy_assignment;
-    typedef std::true_type propagate_on_container_move_assignment;
-    typedef std::true_type propagate_on_container_swap;
-
-#ifdef _LIBCPP_HAS_NO_ADVANCED_SFINAE
-    std::size_t max_size() const
-        {return UINT_MAX / sizeof(T);}
-#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-};
-
-#endif  // TEST_ALLOCATOR_H
diff --git a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h b/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h
deleted file mode 100644
index c5da7e6..0000000
--- a/sources/cxx-stl/llvm-libc++/test/utilities/function.objects/func.wrap/func.wrap.func/test_allocator.h
+++ /dev/null
@@ -1,112 +0,0 @@
-#ifndef TEST_ALLOCATOR_H
-#define TEST_ALLOCATOR_H
-
-#include <cstddef>
-#include <type_traits>
-#include <cstdlib>
-#include <new>
-#include <climits>
-
-class test_alloc_base
-{
-protected:
-    static int count;
-public:
-    static int throw_after;
-};
-
-int test_alloc_base::count = 0;
-int test_alloc_base::throw_after = INT_MAX;
-
-template <class T>
-class test_allocator
-    : public test_alloc_base
-{
-    int data_;
-
-    template <class U> friend class test_allocator;
-public:
-
-    typedef unsigned                                                   size_type;
-    typedef int                                                        difference_type;
-    typedef T                                                          value_type;
-    typedef value_type*                                                pointer;
-    typedef const value_type*                                          const_pointer;
-    typedef typename std::add_lvalue_reference<value_type>::type       reference;
-    typedef typename std::add_lvalue_reference<const value_type>::type const_reference;
-
-    template <class U> struct rebind {typedef test_allocator<U> other;};
-
-    test_allocator() throw() : data_(-1) {}
-    explicit test_allocator(int i) throw() : data_(i) {}
-    test_allocator(const test_allocator& a) throw()
-        : data_(a.data_) {}
-    template <class U> test_allocator(const test_allocator<U>& a) throw()
-        : data_(a.data_) {}
-    ~test_allocator() throw() {data_ = 0;}
-    pointer address(reference x) const {return &x;}
-    const_pointer address(const_reference x) const {return &x;}
-    pointer allocate(size_type n, const void* = 0)
-        {
-            if (count >= throw_after)
-                throw std::bad_alloc();
-            ++count;
-            return (pointer)std::malloc(n * sizeof(T));
-        }
-    void deallocate(pointer p, size_type n)
-        {std::free(p);}
-    size_type max_size() const throw()
-        {return UINT_MAX / sizeof(T);}
-    void construct(pointer p, const T& val)
-        {::new(p) T(val);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void construct(pointer p, T&& val)
-        {::new(p) T(std::move(val));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void destroy(pointer p) {p->~T();}
-
-    friend bool operator==(const test_allocator& x, const test_allocator& y)
-        {return x.data_ == y.data_;}
-    friend bool operator!=(const test_allocator& x, const test_allocator& y)
-        {return !(x == y);}
-};
-
-template <class T>
-class other_allocator
-{
-    int data_;
-
-    template <class U> friend class other_allocator;
-
-public:
-    typedef T value_type;
-
-    other_allocator() : data_(-1) {}
-    explicit other_allocator(int i) : data_(i) {}
-    template <class U> other_allocator(const other_allocator<U>& a)
-        : data_(a.data_) {}
-    T* allocate(std::size_t n)
-        {return (T*)std::malloc(n * sizeof(T));}
-    void deallocate(T* p, std::size_t n)
-        {std::free(p);}
-
-    other_allocator select_on_container_copy_construction() const
-        {return other_allocator(-2);}
-
-    friend bool operator==(const other_allocator& x, const other_allocator& y)
-        {return x.data_ == y.data_;}
-    friend bool operator!=(const other_allocator& x, const other_allocator& y)
-        {return !(x == y);}
-
-    typedef std::true_type propagate_on_container_copy_assignment;
-    typedef std::true_type propagate_on_container_move_assignment;
-    typedef std::true_type propagate_on_container_swap;
-
-#ifdef _LIBCPP_HAS_NO_ADVANCED_SFINAE
-    std::size_t max_size() const
-        {return UINT_MAX / sizeof(T);}
-#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-};
-
-#endif  // TEST_ALLOCATOR_H
diff --git a/sources/cxx-stl/llvm-libc++/tools/upgrade-upstream.sh b/sources/cxx-stl/llvm-libc++/tools/upgrade-upstream.sh
new file mode 100755
index 0000000..cb8af81
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/tools/upgrade-upstream.sh
@@ -0,0 +1,213 @@
+#!/bin/sh
+#
+# A small script used to update the content of libcxx/ to a newer
+# version of libc++.
+#
+
+PROGDIR=$(dirname "$0")
+PROGNAME=$(basename "$0")
+
+# Assume this script is under tools/
+NDK_LIBCXX_DIR=$(cd "$PROGDIR"/.. && pwd)
+
+# Sanitize environment.
+set -e
+export LANG=C
+export LC_ALL=C
+
+# Helper functions
+VERBOSE=1
+
+run () {
+  if [ "$VERBOSE" -gt 1 ]; then
+    echo "COMMAND: $@"
+  fi
+  case $VERBOSE in
+    0|1)
+        "$@" >/dev/null 2>&1
+        ;;
+    2)
+        "$@" >/dev/null
+        ;;
+    *)
+        "$@"
+        ;;
+  esac
+}
+
+log () {
+  if [ "$VERBOSE" -gt 1 ]; then
+    printf "%s\n" "$@"
+  fi
+}
+
+get_config_field () {
+  cat "$NDK_LIBCXX_DIR"/upstream.config | awk '$1 == "'$1':" { print $2; }'
+}
+
+# Process command line.
+
+DO_HELP=
+NO_CLEANUP=
+
+for opt; do
+  case $opt in
+    --verbose)
+      VERBOSE=$(( $VERBOSE + 1 ))
+      ;;
+    --help)
+      DO_HELP=true
+      ;;
+    --no-cleanup)
+      NO_CLEANUP=true
+      ;;
+    -*)
+      echo "ERROR: Unknown option '$opt'. See --help."
+      exit 1
+      ;;
+  esac
+done
+
+if [ "$DO_HELP" ]; then
+    echo "Usage: $PROGNAME [options]"
+    echo ""
+    echo "This script is used to update the LLVM libc++ sources to a"
+    echo "more recent version."
+    echo ""
+    echo "Valid options:"
+    echo "   --help        Print this message."
+    echo "   --verbose     Increase verbosity."
+    echo "   --no-cleanup  Don't remove build directory on exit."
+    echo ""
+    exit 0
+fi
+
+# Create build directory.
+BUILD_DIR=/tmp/ndk-$USER/llvm-libc++/build
+mkdir -p "$BUILD_DIR" && rm -rf "$BUILD_DIR"/*
+
+# Ensure it is cleared when this script exits.
+run_on_exit () {
+  if [ -z "$NO_CLEANUP" ]; then
+    # Remove temporary build directory.
+    rm -rf "$BUILD_DIR"
+  fi
+}
+trap "run_on_exit \$?" EXIT QUIT HUP TERM INT
+
+# Get upstream SVN and revision number.
+SVN_URL=$(get_config_field svn)
+if [ -z "$SVN_URL" ]; then
+  echo "ERROR: Can't find SVN upstream in upstream.config!"
+  exit 1
+fi
+
+REVISION=$(get_config_field revision)
+if [ -z "$REVISION" ]; then
+  echo "ERROR: Can't find upstream revision in upstream.config!"
+  exit 1
+fi
+
+run cd $BUILD_DIR &&
+echo "Checking out $SVN_URL@$REVISION"
+run svn co $SVN_URL@$REVISION libcxx > /dev/null
+run cd libcxx
+
+echo "Creating git repository and 'master' branch."
+run git init
+echo \
+".gitignore
+.svn/
+" > .gitignore
+
+run git add .
+run git add -f .gitignore
+run git commit -m "upstream @$REVISION"
+
+echo "Create 'ndk' branch and apply patches.android/*"
+run git branch ndk master
+run git checkout ndk
+if [ -d "$NDK_LIBCXX_DIR/xxxpatches.android" ]; then
+  (
+    set +e;
+    run git am "$NDK_LIBCXX_DIR"/patches.android/*
+    if [ "$?" != 0 ]; then
+      echo "A problem occured while applying the patches!!"
+      exit 1
+    fi
+  )
+fi
+
+echo "Updating to newer upstream revision"
+run git checkout master
+run git tag revision-$REVISION HEAD
+
+run svn update
+NEW_REVISION=$(svn info | awk '$1 == "Revision:" { print $2; }')
+echo "Found new revision: $NEW_REVISION (was $REVISION)"
+
+ADDED_FILES=$(git ls-files -o --exclude-standard)
+MODIFIED_FILES=$(git ls-files -m)
+REMOVED_FILES=$(git ls-files -d)
+log "ADDED_FILES='$ADDED_FILES'"
+log "MODIFIED_FILES='$MODIFIED_FILES'"
+log "REMOVED_FILES='$REMOVED_FILES'"
+CHANGED=
+if [ -n "$ADDED_FILES" ]; then
+  run git add $ADDED_FILES
+  CHANGED=true
+fi
+if [ -n "$MODIFIED_FILES" ]; then
+  run git add $MODIFIED_FILES
+  CHANGED=true
+fi
+if [ -n "$REMOVED_FILES" ]; then
+  run git rm -f $REMOVED_FILES
+  CHANGED=true
+fi
+
+if [ -z "$CHANGED" ]; then
+  echo "No changes detected. Exiting."
+  exit 0
+fi
+
+ADDED_COUNT=$(echo "$ADDED_FILES" | wc -l)
+MODIFIED_COUNT=$(echo "$MODIFIED_FILES" | wc -l)
+REMOVED_COUNT=$(echo "$REMOVED_FILES" | wc -l)
+echo "Commiting changes ($ADDED_COUNT new, $MODIFIED_COUNT changed, $REMOVED_COUNT deleted)"
+run git commit -m "upstream @$NEW_REVISION"
+run git tag revision-$NEW_REVISION
+
+echo "Updating NDK branch."
+run git checkout ndk
+run git tag android-0 HEAD
+run git rebase revision-$NEW_REVISION
+
+echo "Re-creating new Android patches."
+run git format-patch -k -o "$BUILD_DIR"/patches.android revision-$NEW_REVISION
+run git format-patch -k -o "$BUILD_DIR"/patches.libcxx android-0
+
+echo "Updating local sources"
+run cd "$NDK_LIBCXX_DIR"/libcxx
+for PATCH in "$BUILD_DIR"/patches.libcxx/*.patch; do
+  (
+    set +e
+    run patch -p1 < "$PATCH"
+    if [ $? != 0 ]; then
+      echo "ERROR: Can't apply $PATCH properly!"
+      exit 1
+    fi
+  )
+done
+
+echo "Updating local patches"
+run cd "$NDK_LIBCXX_DIR"
+run git rm -f patches.android/*
+run cp "$BUILD_DIR"/patches.android/* patches.android/
+run git add patches.android/*
+
+echo "Updating upstream.config"
+sed -i -e "s|revision: $REVISION|revision: $NEW_REVISION|" "$NDK_LIBCXX_DIR"/upstream.config
+git add "$NDK_LIBCXX_DIR"/upstream.config
+
+echo "Done updating to $NEW_REVISION."
diff --git a/sources/cxx-stl/llvm-libc++/upstream.config b/sources/cxx-stl/llvm-libc++/upstream.config
new file mode 100644
index 0000000..42aec0e
--- /dev/null
+++ b/sources/cxx-stl/llvm-libc++/upstream.config
@@ -0,0 +1,2 @@
+svn: http://llvm.org/svn/llvm-project/libcxx/trunk
+revision: 180916
diff --git a/sources/cxx-stl/llvm-libc++/www/atomic_design.html b/sources/cxx-stl/llvm-libc++/www/atomic_design.html
deleted file mode 100644
index 87a2f62..0000000
--- a/sources/cxx-stl/llvm-libc++/www/atomic_design.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-          "http://www.w3.org/TR/html4/strict.dtd">
-<!-- Material used from: HTML 4.01 specs: http://www.w3.org/TR/html401/ -->
-<html>
-<head>
-  <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-  <title>&lt;atomic&gt; design</title>
-  <link type="text/css" rel="stylesheet" href="menu.css">
-  <link type="text/css" rel="stylesheet" href="content.css">
-</head>
-
-<body>
-<div id="menu">
-  <div>
-    <a href="http://llvm.org/">LLVM Home</a>
-  </div>
-
-  <div class="submenu">
-    <label>libc++ Info</label>
-    <a href="/index.html">About</a>
-  </div>
-
-  <div class="submenu">
-    <label>Quick Links</label>
-    <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev">cfe-dev</a>
-    <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits">cfe-commits</a>
-    <a href="http://llvm.org/bugs/">Bug Reports</a>
-    <a href="http://llvm.org/svn/llvm-project/libcxx/trunk/">Browse SVN</a>
-    <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/">Browse ViewVC</a>
-  </div>
-</div>
-
-<div id="content">
-  <!--*********************************************************************-->
-  <h1>&lt;atomic&gt; design</h1>
-  <!--*********************************************************************-->
-
-<p>
-There are currently 3 designs under consideration.  They differ in where most
-of the implmentation work is done.  The functionality exposed to the customer
-should be identical (and conforming) for all three designs.
-</p>
-
-<ol type="A">
-<li>
-<a href="atomic_design_a.html">Minimal work for the library</a>
-</li>
-<li>
-<a href="atomic_design_b.html">Something in between</a>
-</li>
-<li>
-<a href="atomic_design_c.html">Minimal work for the front end</a>
-</li>
-</ol>
-
-<p>
-With any design, the (back end) compiler writer should note:
-</p>
-
-<blockquote>
-<p>
-The decision to implement lock-free operations on any given type (or not) is an
-ABI-binding decision.  One can not change from treating a type as not lock free,
-to lock free (or vice-versa) without breaking your ABI.
-</p>
-
-<p>
-Example:
-</p>
-
-<blockquote><pre>
-TU1.cc
------------
-extern atomic&lt;long long&gt; A;
-int foo() { return A.compare_exchange_strong(w, x); }
-
-TU2.cc
------------
-extern atomic&lt;long long&gt; A;
-void bar() { return A.compare_exchange_strong(y, z); }
-</pre></blockquote>
-</blockquote>
-
-<p>
-If only <em>one</em> of these calls to <tt>compare_exchange_strong</tt> is
-implemented with mutex-locked code, then that mutex-locked code will not be
-executed mutually exclusively of the one implemented in a lock-free manner.
-</p>
-
-</div>
-</body>
-</html>
diff --git a/sources/cxx-stl/llvm-libc++/www/atomic_design_a.html b/sources/cxx-stl/llvm-libc++/www/atomic_design_a.html
deleted file mode 100644
index 0fc0043..0000000
--- a/sources/cxx-stl/llvm-libc++/www/atomic_design_a.html
+++ /dev/null
@@ -1,309 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-          "http://www.w3.org/TR/html4/strict.dtd">
-<!-- Material used from: HTML 4.01 specs: http://www.w3.org/TR/html401/ -->
-<html>
-<head>
-  <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-  <title>&lt;atomic&gt; design</title>
-  <link type="text/css" rel="stylesheet" href="menu.css">
-  <link type="text/css" rel="stylesheet" href="content.css">
-</head>
-
-<body>
-<div id="menu">
-  <div>
-    <a href="http://llvm.org/">LLVM Home</a>
-  </div>
-
-  <div class="submenu">
-    <label>libc++ Info</label>
-    <a href="/index.html">About</a>
-  </div>
-
-  <div class="submenu">
-    <label>Quick Links</label>
-    <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev">cfe-dev</a>
-    <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits">cfe-commits</a>
-    <a href="http://llvm.org/bugs/">Bug Reports</a>
-    <a href="http://llvm.org/svn/llvm-project/libcxx/trunk/">Browse SVN</a>
-    <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/">Browse ViewVC</a>
-  </div>
-</div>
-
-<div id="content">
-  <!--*********************************************************************-->
-  <h1>&lt;atomic&gt; design</h1>
-  <!--*********************************************************************-->
-
-<p>
-The compiler supplies all of the intrinsics as described below.  This list of
-intrinsics roughly parallels the requirements of the C and C++ atomics
-proposals.  The C and C++ library imlpementations simply drop through to these
-intrinsics.  Anything the platform does not support in hardware, the compiler
-arranges for a (compiler-rt) library call to be made which will do the job with
-a mutex, and in this case ignoring the memory ordering parameter (effectively
-implementing <tt>memory_order_seq_cst</tt>).
-</p>
-
-<p>
-Ultimate efficiency is preferred over run time error checking.  Undefined
-behavior is acceptable when the inputs do not conform as defined below.
-</p>
-
-<blockquote><pre>
-<font color="#C80000">// In every intrinsic signature below, type* atomic_obj may be a pointer to a</font>
-<font color="#C80000">//    volatile-qualifed type.</font>
-<font color="#C80000">// Memory ordering values map to the following meanings:</font>
-<font color="#C80000">//   memory_order_relaxed == 0</font>
-<font color="#C80000">//   memory_order_consume == 1</font>
-<font color="#C80000">//   memory_order_acquire == 2</font>
-<font color="#C80000">//   memory_order_release == 3</font>
-<font color="#C80000">//   memory_order_acq_rel == 4</font>
-<font color="#C80000">//   memory_order_seq_cst == 5</font>
-
-<font color="#C80000">// type must be trivially copyable</font>
-<font color="#C80000">// type represents a "type argument"</font>
-bool __atomic_is_lock_free(type);
-
-<font color="#C80000">// type must be trivially copyable</font>
-<font color="#C80000">// Behavior is defined for mem_ord = 0, 1, 2, 5</font>
-type __atomic_load(const type* atomic_obj, int mem_ord);
-
-<font color="#C80000">// type must be trivially copyable</font>
-<font color="#C80000">// Behavior is defined for mem_ord = 0, 3, 5</font>
-void __atomic_store(type* atomic_obj, type desired, int mem_ord);
-
-<font color="#C80000">// type must be trivially copyable</font>
-<font color="#C80000">// Behavior is defined for mem_ord = [0 ... 5]</font>
-type __atomic_exchange(type* atomic_obj, type desired, int mem_ord);
-
-<font color="#C80000">// type must be trivially copyable</font>
-<font color="#C80000">// Behavior is defined for mem_success = [0 ... 5],</font>
-<font color="#C80000">//   mem_failure &lt;= mem_success</font>
-<font color="#C80000">//   mem_failure != 3</font>
-<font color="#C80000">//   mem_failure != 4</font>
-bool __atomic_compare_exchange_strong(type* atomic_obj,
-                                      type* expected, type desired,
-                                      int mem_success, int mem_failure);
-
-<font color="#C80000">// type must be trivially copyable</font>
-<font color="#C80000">// Behavior is defined for mem_success = [0 ... 5],</font>
-<font color="#C80000">//   mem_failure &lt;= mem_success</font>
-<font color="#C80000">//   mem_failure != 3</font>
-<font color="#C80000">//   mem_failure != 4</font>
-bool __atomic_compare_exchange_weak(type* atomic_obj,
-                                    type* expected, type desired,
-                                    int mem_success, int mem_failure);
-
-<font color="#C80000">// type is one of: char, signed char, unsigned char, short, unsigned short, int,</font>
-<font color="#C80000">//      unsigned int, long, unsigned long, long long, unsigned long long,</font>
-<font color="#C80000">//      char16_t, char32_t, wchar_t</font>
-<font color="#C80000">// Behavior is defined for mem_ord = [0 ... 5]</font>
-type __atomic_fetch_add(type* atomic_obj, type operand, int mem_ord);
-
-<font color="#C80000">// type is one of: char, signed char, unsigned char, short, unsigned short, int,</font>
-<font color="#C80000">//      unsigned int, long, unsigned long, long long, unsigned long long,</font>
-<font color="#C80000">//      char16_t, char32_t, wchar_t</font>
-<font color="#C80000">// Behavior is defined for mem_ord = [0 ... 5]</font>
-type __atomic_fetch_sub(type* atomic_obj, type operand, int mem_ord);
-
-<font color="#C80000">// type is one of: char, signed char, unsigned char, short, unsigned short, int,</font>
-<font color="#C80000">//      unsigned int, long, unsigned long, long long, unsigned long long,</font>
-<font color="#C80000">//      char16_t, char32_t, wchar_t</font>
-<font color="#C80000">// Behavior is defined for mem_ord = [0 ... 5]</font>
-type __atomic_fetch_and(type* atomic_obj, type operand, int mem_ord);
-
-<font color="#C80000">// type is one of: char, signed char, unsigned char, short, unsigned short, int,</font>
-<font color="#C80000">//      unsigned int, long, unsigned long, long long, unsigned long long,</font>
-<font color="#C80000">//      char16_t, char32_t, wchar_t</font>
-<font color="#C80000">// Behavior is defined for mem_ord = [0 ... 5]</font>
-type __atomic_fetch_or(type* atomic_obj, type operand, int mem_ord);
-
-<font color="#C80000">// type is one of: char, signed char, unsigned char, short, unsigned short, int,</font>
-<font color="#C80000">//      unsigned int, long, unsigned long, long long, unsigned long long,</font>
-<font color="#C80000">//      char16_t, char32_t, wchar_t</font>
-<font color="#C80000">// Behavior is defined for mem_ord = [0 ... 5]</font>
-type __atomic_fetch_xor(type* atomic_obj, type operand, int mem_ord);
-
-<font color="#C80000">// Behavior is defined for mem_ord = [0 ... 5]</font>
-void* __atomic_fetch_add(void** atomic_obj, ptrdiff_t operand, int mem_ord);
-void* __atomic_fetch_sub(void** atomic_obj, ptrdiff_t operand, int mem_ord);
-
-<font color="#C80000">// Behavior is defined for mem_ord = [0 ... 5]</font>
-void __atomic_thread_fence(int mem_ord);
-void __atomic_signal_fence(int mem_ord);
-</pre></blockquote>
-
-<p>
-If desired the intrinsics taking a single <tt>mem_ord</tt> parameter can default
-this argument to 5.
-</p>
-
-<p>
-If desired the intrinsics taking two ordering parameters can default
-<tt>mem_success</tt> to 5, and <tt>mem_failure</tt> to
-<tt>translate_memory_order(mem_success)</tt> where
-<tt>translate_memory_order(mem_success)</tt> is defined as:
-</p>
-
-<blockquote><pre>
-int
-translate_memory_order(int o)
-{
-    switch (o)
-    {
-    case 4:
-        return 2;
-    case 3:
-        return 0;
-    }
-    return o;
-}
-</pre></blockquote>
-
-<p>
-Below are representative C++ implementations of all of the operations.  Their
-purpose is to document the desired semantics of each operation, assuming
-<tt>memory_order_seq_cst</tt>.  This is essentially the code that will be called
-if the front end calls out to compiler-rt.
-</p>
-
-<blockquote><pre>
-template &lt;class T&gt;
-T
-__atomic_load(T const volatile* obj)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    return *obj;
-}
-
-template &lt;class T&gt;
-void
-__atomic_store(T volatile* obj, T desr)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    *obj = desr;
-}
-
-template &lt;class T&gt;
-T
-__atomic_exchange(T volatile* obj, T desr)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    T r = *obj;
-    *obj = desr;
-    return r;
-}
-
-template &lt;class T&gt;
-bool
-__atomic_compare_exchange_strong(T volatile* obj, T* exp, T desr)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    if (std::memcmp(const_cast&lt;T*&gt;(obj), exp, sizeof(T)) == 0) <font color="#C80000">// if (*obj == *exp)</font>
-    {
-        std::memcpy(const_cast&lt;T*&gt;(obj), &amp;desr, sizeof(T)); <font color="#C80000">// *obj = desr;</font>
-        return true;
-    }
-    std::memcpy(exp, const_cast&lt;T*&gt;(obj), sizeof(T)); <font color="#C80000">// *exp = *obj;</font>
-    return false;
-}
-
-<font color="#C80000">// May spuriously return false (even if *obj == *exp)</font>
-template &lt;class T&gt;
-bool
-__atomic_compare_exchange_weak(T volatile* obj, T* exp, T desr)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    if (std::memcmp(const_cast&lt;T*&gt;(obj), exp, sizeof(T)) == 0) <font color="#C80000">// if (*obj == *exp)</font>
-    {
-        std::memcpy(const_cast&lt;T*&gt;(obj), &amp;desr, sizeof(T)); <font color="#C80000">// *obj = desr;</font>
-        return true;
-    }
-    std::memcpy(exp, const_cast&lt;T*&gt;(obj), sizeof(T)); <font color="#C80000">// *exp = *obj;</font>
-    return false;
-}
-
-template &lt;class T&gt;
-T
-__atomic_fetch_add(T volatile* obj, T operand)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    T r = *obj;
-    *obj += operand;
-    return r;
-}
-
-template &lt;class T&gt;
-T
-__atomic_fetch_sub(T volatile* obj, T operand)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    T r = *obj;
-    *obj -= operand;
-    return r;
-}
-
-template &lt;class T&gt;
-T
-__atomic_fetch_and(T volatile* obj, T operand)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    T r = *obj;
-    *obj &amp;= operand;
-    return r;
-}
-
-template &lt;class T&gt;
-T
-__atomic_fetch_or(T volatile* obj, T operand)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    T r = *obj;
-    *obj |= operand;
-    return r;
-}
-
-template &lt;class T&gt;
-T
-__atomic_fetch_xor(T volatile* obj, T operand)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    T r = *obj;
-    *obj ^= operand;
-    return r;
-}
-
-void*
-__atomic_fetch_add(void* volatile* obj, ptrdiff_t operand)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    void* r = *obj;
-    (char*&amp;)(*obj) += operand;
-    return r;
-}
-
-void*
-__atomic_fetch_sub(void* volatile* obj, ptrdiff_t operand)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    void* r = *obj;
-    (char*&amp;)(*obj) -= operand;
-    return r;
-}
-
-void __atomic_thread_fence()
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-}
-
-void __atomic_signal_fence()
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-}
-</pre></blockquote>
-
-
-</div>
-</body>
-</html>
diff --git a/sources/cxx-stl/llvm-libc++/www/atomic_design_b.html b/sources/cxx-stl/llvm-libc++/www/atomic_design_b.html
deleted file mode 100644
index b738445..0000000
--- a/sources/cxx-stl/llvm-libc++/www/atomic_design_b.html
+++ /dev/null
@@ -1,250 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-          "http://www.w3.org/TR/html4/strict.dtd">
-<!-- Material used from: HTML 4.01 specs: http://www.w3.org/TR/html401/ -->
-<html>
-<head>
-  <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-  <title>&lt;atomic&gt; design</title>
-  <link type="text/css" rel="stylesheet" href="menu.css">
-  <link type="text/css" rel="stylesheet" href="content.css">
-</head>
-
-<body>
-<div id="menu">
-  <div>
-    <a href="http://llvm.org/">LLVM Home</a>
-  </div>
-
-  <div class="submenu">
-    <label>libc++ Info</label>
-    <a href="/index.html">About</a>
-  </div>
-
-  <div class="submenu">
-    <label>Quick Links</label>
-    <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev">cfe-dev</a>
-    <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits">cfe-commits</a>
-    <a href="http://llvm.org/bugs/">Bug Reports</a>
-    <a href="http://llvm.org/svn/llvm-project/libcxx/trunk/">Browse SVN</a>
-    <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/">Browse ViewVC</a>
-  </div>
-</div>
-
-<div id="content">
-  <!--*********************************************************************-->
-  <h1>&lt;atomic&gt; design</h1>
-  <!--*********************************************************************-->
-
-<p>
-This is a variation of design A which puts the burden on the library to arrange
-for the correct manipulation of the run time memory ordering arguments, and only
-calls the compiler for well-defined memory orderings.  I think of this design as
-the worst of A and C, instead of the best of A and C.  But I offer it as an
-option in the spirit of completeness.
-</p>
-
-<blockquote><pre>
-<font color="#C80000">// type must be trivially copyable</font>
-bool __atomic_is_lock_free(const type* atomic_obj);
-
-<font color="#C80000">// type must be trivially copyable</font>
-type __atomic_load_relaxed(const volatile type* atomic_obj);
-type __atomic_load_consume(const volatile type* atomic_obj);
-type __atomic_load_acquire(const volatile type* atomic_obj);
-type __atomic_load_seq_cst(const volatile type* atomic_obj);
-
-<font color="#C80000">// type must be trivially copyable</font>
-type __atomic_store_relaxed(volatile type* atomic_obj, type desired);
-type __atomic_store_release(volatile type* atomic_obj, type desired);
-type __atomic_store_seq_cst(volatile type* atomic_obj, type desired);
-
-<font color="#C80000">// type must be trivially copyable</font>
-type __atomic_exchange_relaxed(volatile type* atomic_obj, type desired);
-type __atomic_exchange_consume(volatile type* atomic_obj, type desired);
-type __atomic_exchange_acquire(volatile type* atomic_obj, type desired);
-type __atomic_exchange_release(volatile type* atomic_obj, type desired);
-type __atomic_exchange_acq_rel(volatile type* atomic_obj, type desired);
-type __atomic_exchange_seq_cst(volatile type* atomic_obj, type desired);
-
-<font color="#C80000">// type must be trivially copyable</font>
-bool __atomic_compare_exchange_strong_relaxed_relaxed(volatile type* atomic_obj,
-                                                      type* expected,
-                                                      type desired);
-bool __atomic_compare_exchange_strong_consume_relaxed(volatile type* atomic_obj,
-                                                      type* expected,
-                                                      type desired);
-bool __atomic_compare_exchange_strong_consume_consume(volatile type* atomic_obj,
-                                                      type* expected,
-                                                      type desired);
-bool __atomic_compare_exchange_strong_acquire_relaxed(volatile type* atomic_obj,
-                                                      type* expected,
-                                                      type desired);
-bool __atomic_compare_exchange_strong_acquire_consume(volatile type* atomic_obj,
-                                                      type* expected,
-                                                      type desired);
-bool __atomic_compare_exchange_strong_acquire_acquire(volatile type* atomic_obj,
-                                                      type* expected,
-                                                      type desired);
-bool __atomic_compare_exchange_strong_release_relaxed(volatile type* atomic_obj,
-                                                      type* expected,
-                                                      type desired);
-bool __atomic_compare_exchange_strong_release_consume(volatile type* atomic_obj,
-                                                      type* expected,
-                                                      type desired);
-bool __atomic_compare_exchange_strong_release_acquire(volatile type* atomic_obj,
-                                                      type* expected,
-                                                      type desired);
-bool __atomic_compare_exchange_strong_acq_rel_relaxed(volatile type* atomic_obj,
-                                                      type* expected,
-                                                      type desired);
-bool __atomic_compare_exchange_strong_acq_rel_consume(volatile type* atomic_obj,
-                                                      type* expected,
-                                                      type desired);
-bool __atomic_compare_exchange_strong_acq_rel_acquire(volatile type* atomic_obj,
-                                                      type* expected,
-                                                      type desired);
-bool __atomic_compare_exchange_strong_seq_cst_relaxed(volatile type* atomic_obj,
-                                                      type* expected,
-                                                      type desired);
-bool __atomic_compare_exchange_strong_seq_cst_consume(volatile type* atomic_obj,
-                                                      type* expected,
-                                                      type desired);
-bool __atomic_compare_exchange_strong_seq_cst_acquire(volatile type* atomic_obj,
-                                                      type* expected,
-                                                      type desired);
-bool __atomic_compare_exchange_strong_seq_cst_seq_cst(volatile type* atomic_obj,
-                                                      type* expected,
-                                                      type desired);
-
-<font color="#C80000">// type must be trivially copyable</font>
-bool __atomic_compare_exchange_weak_relaxed_relaxed(volatile type* atomic_obj,
-                                                    type* expected,
-                                                    type desired);
-bool __atomic_compare_exchange_weak_consume_relaxed(volatile type* atomic_obj,
-                                                    type* expected,
-                                                    type desired);
-bool __atomic_compare_exchange_weak_consume_consume(volatile type* atomic_obj,
-                                                    type* expected,
-                                                    type desired);
-bool __atomic_compare_exchange_weak_acquire_relaxed(volatile type* atomic_obj,
-                                                    type* expected,
-                                                    type desired);
-bool __atomic_compare_exchange_weak_acquire_consume(volatile type* atomic_obj,
-                                                    type* expected,
-                                                    type desired);
-bool __atomic_compare_exchange_weak_acquire_acquire(volatile type* atomic_obj,
-                                                    type* expected,
-                                                    type desired);
-bool __atomic_compare_exchange_weak_release_relaxed(volatile type* atomic_obj,
-                                                    type* expected,
-                                                    type desired);
-bool __atomic_compare_exchange_weak_release_consume(volatile type* atomic_obj,
-                                                    type* expected,
-                                                    type desired);
-bool __atomic_compare_exchange_weak_release_acquire(volatile type* atomic_obj,
-                                                    type* expected,
-                                                    type desired);
-bool __atomic_compare_exchange_weak_acq_rel_relaxed(volatile type* atomic_obj,
-                                                    type* expected,
-                                                    type desired);
-bool __atomic_compare_exchange_weak_acq_rel_consume(volatile type* atomic_obj,
-                                                    type* expected,
-                                                    type desired);
-bool __atomic_compare_exchange_weak_acq_rel_acquire(volatile type* atomic_obj,
-                                                    type* expected,
-                                                    type desired);
-bool __atomic_compare_exchange_weak_seq_cst_relaxed(volatile type* atomic_obj,
-                                                    type* expected,
-                                                    type desired);
-bool __atomic_compare_exchange_weak_seq_cst_consume(volatile type* atomic_obj,
-                                                    type* expected,
-                                                    type desired);
-bool __atomic_compare_exchange_weak_seq_cst_acquire(volatile type* atomic_obj,
-                                                    type* expected,
-                                                    type desired);
-bool __atomic_compare_exchange_weak_seq_cst_seq_cst(volatile type* atomic_obj,
-                                                    type* expected,
-                                                    type desired);
-
-<font color="#C80000">// type is one of: char, signed char, unsigned char, short, unsigned short, int,</font>
-<font color="#C80000">//      unsigned int, long, unsigned long, long long, unsigned long long,</font>
-<font color="#C80000">//      char16_t, char32_t, wchar_t</font>
-type __atomic_fetch_add_relaxed(volatile type* atomic_obj, type operand);
-type __atomic_fetch_add_consume(volatile type* atomic_obj, type operand);
-type __atomic_fetch_add_acquire(volatile type* atomic_obj, type operand);
-type __atomic_fetch_add_release(volatile type* atomic_obj, type operand);
-type __atomic_fetch_add_acq_rel(volatile type* atomic_obj, type operand);
-type __atomic_fetch_add_seq_cst(volatile type* atomic_obj, type operand);
-
-<font color="#C80000">// type is one of: char, signed char, unsigned char, short, unsigned short, int,</font>
-<font color="#C80000">//      unsigned int, long, unsigned long, long long, unsigned long long,</font>
-<font color="#C80000">//      char16_t, char32_t, wchar_t</font>
-type __atomic_fetch_sub_relaxed(volatile type* atomic_obj, type operand);
-type __atomic_fetch_sub_consume(volatile type* atomic_obj, type operand);
-type __atomic_fetch_sub_acquire(volatile type* atomic_obj, type operand);
-type __atomic_fetch_sub_release(volatile type* atomic_obj, type operand);
-type __atomic_fetch_sub_acq_rel(volatile type* atomic_obj, type operand);
-type __atomic_fetch_sub_seq_cst(volatile type* atomic_obj, type operand);
-
-<font color="#C80000">// type is one of: char, signed char, unsigned char, short, unsigned short, int,</font>
-<font color="#C80000">//      unsigned int, long, unsigned long, long long, unsigned long long,</font>
-<font color="#C80000">//      char16_t, char32_t, wchar_t</font>
-type __atomic_fetch_and_relaxed(volatile type* atomic_obj, type operand);
-type __atomic_fetch_and_consume(volatile type* atomic_obj, type operand);
-type __atomic_fetch_and_acquire(volatile type* atomic_obj, type operand);
-type __atomic_fetch_and_release(volatile type* atomic_obj, type operand);
-type __atomic_fetch_and_acq_rel(volatile type* atomic_obj, type operand);
-type __atomic_fetch_and_seq_cst(volatile type* atomic_obj, type operand);
-
-<font color="#C80000">// type is one of: char, signed char, unsigned char, short, unsigned short, int,</font>
-<font color="#C80000">//      unsigned int, long, unsigned long, long long, unsigned long long,</font>
-<font color="#C80000">//      char16_t, char32_t, wchar_t</font>
-type __atomic_fetch_or_relaxed(volatile type* atomic_obj, type operand);
-type __atomic_fetch_or_consume(volatile type* atomic_obj, type operand);
-type __atomic_fetch_or_acquire(volatile type* atomic_obj, type operand);
-type __atomic_fetch_or_release(volatile type* atomic_obj, type operand);
-type __atomic_fetch_or_acq_rel(volatile type* atomic_obj, type operand);
-type __atomic_fetch_or_seq_cst(volatile type* atomic_obj, type operand);
-
-<font color="#C80000">// type is one of: char, signed char, unsigned char, short, unsigned short, int,</font>
-<font color="#C80000">//      unsigned int, long, unsigned long, long long, unsigned long long,</font>
-<font color="#C80000">//      char16_t, char32_t, wchar_t</font>
-type __atomic_fetch_xor_relaxed(volatile type* atomic_obj, type operand);
-type __atomic_fetch_xor_consume(volatile type* atomic_obj, type operand);
-type __atomic_fetch_xor_acquire(volatile type* atomic_obj, type operand);
-type __atomic_fetch_xor_release(volatile type* atomic_obj, type operand);
-type __atomic_fetch_xor_acq_rel(volatile type* atomic_obj, type operand);
-type __atomic_fetch_xor_seq_cst(volatile type* atomic_obj, type operand);
-
-void* __atomic_fetch_add_relaxed(void* volatile* atomic_obj, ptrdiff_t operand);
-void* __atomic_fetch_add_consume(void* volatile* atomic_obj, ptrdiff_t operand);
-void* __atomic_fetch_add_acquire(void* volatile* atomic_obj, ptrdiff_t operand);
-void* __atomic_fetch_add_release(void* volatile* atomic_obj, ptrdiff_t operand);
-void* __atomic_fetch_add_acq_rel(void* volatile* atomic_obj, ptrdiff_t operand);
-void* __atomic_fetch_add_seq_cst(void* volatile* atomic_obj, ptrdiff_t operand);
-
-void* __atomic_fetch_sub_relaxed(void* volatile* atomic_obj, ptrdiff_t operand);
-void* __atomic_fetch_sub_consume(void* volatile* atomic_obj, ptrdiff_t operand);
-void* __atomic_fetch_sub_acquire(void* volatile* atomic_obj, ptrdiff_t operand);
-void* __atomic_fetch_sub_release(void* volatile* atomic_obj, ptrdiff_t operand);
-void* __atomic_fetch_sub_acq_rel(void* volatile* atomic_obj, ptrdiff_t operand);
-void* __atomic_fetch_sub_seq_cst(void* volatile* atomic_obj, ptrdiff_t operand);
-
-void __atomic_thread_fence_relaxed();
-void __atomic_thread_fence_consume();
-void __atomic_thread_fence_acquire();
-void __atomic_thread_fence_release();
-void __atomic_thread_fence_acq_rel();
-void __atomic_thread_fence_seq_cst();
-
-void __atomic_signal_fence_relaxed();
-void __atomic_signal_fence_consume();
-void __atomic_signal_fence_acquire();
-void __atomic_signal_fence_release();
-void __atomic_signal_fence_acq_rel();
-void __atomic_signal_fence_seq_cst();
-</pre></blockquote>
-
-</div>
-</body>
-</html>
diff --git a/sources/cxx-stl/llvm-libc++/www/atomic_design_c.html b/sources/cxx-stl/llvm-libc++/www/atomic_design_c.html
deleted file mode 100644
index ae2f5ff..0000000
--- a/sources/cxx-stl/llvm-libc++/www/atomic_design_c.html
+++ /dev/null
@@ -1,458 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-          "http://www.w3.org/TR/html4/strict.dtd">
-<!-- Material used from: HTML 4.01 specs: http://www.w3.org/TR/html401/ -->
-<html>
-<head>
-  <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-  <title>&lt;atomic&gt; design</title>
-  <link type="text/css" rel="stylesheet" href="menu.css">
-  <link type="text/css" rel="stylesheet" href="content.css">
-</head>
-
-<body>
-<div id="menu">
-  <div>
-    <a href="http://llvm.org/">LLVM Home</a>
-  </div>
-
-  <div class="submenu">
-    <label>libc++ Info</label>
-    <a href="/index.html">About</a>
-  </div>
-
-  <div class="submenu">
-    <label>Quick Links</label>
-    <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev">cfe-dev</a>
-    <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits">cfe-commits</a>
-    <a href="http://llvm.org/bugs/">Bug Reports</a>
-    <a href="http://llvm.org/svn/llvm-project/libcxx/trunk/">Browse SVN</a>
-    <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/">Browse ViewVC</a>
-  </div>
-</div>
-
-<div id="content">
-  <!--*********************************************************************-->
-  <h1>&lt;atomic&gt; design</h1>
-  <!--*********************************************************************-->
-
-<p>
-The <tt>&lt;atomic&gt;</tt> header is one of the most closely coupled headers to
-the compiler.  Ideally when you invoke any function from
-<tt>&lt;atomic&gt;</tt>, it should result in highly optimized assembly being
-inserted directly into your application ...  assembly that is not otherwise
-representable by higher level C or C++ expressions.  The design of the libc++
-<tt>&lt;atomic&gt;</tt> header started with this goal in mind.  A secondary, but
-still very important goal is that the compiler should have to do minimal work to
-faciliate the implementaiton of <tt>&lt;atomic&gt;</tt>.  Without this second
-goal, then practically speaking, the libc++ <tt>&lt;atomic&gt;</tt> header would
-be doomed to be a barely supported, second class citizen on almost every
-platform.
-</p>
-
-<p>Goals:</p>
-
-<blockquote><ul>
-<li>Optimal code generation for atomic operations</li>
-<li>Minimal effort for the compiler to achieve goal 1 on any given platform</li>
-<li>Conformance to the C++0X draft standard</li>
-</ul></blockquote>
-
-<p>
-The purpose of this document is to inform compiler writers what they need to do
-to enable a high performance libc++ <tt>&lt;atomic&gt;</tt> with minimal effort.
-</p>
-
-<h2>The minimal work that must be done for a conforming <tt>&lt;atomic&gt;</tt></h2>
-
-<p>
-The only "atomic" operations that must actually be lock free in
-<tt>&lt;atomic&gt;</tt> are represented by the following compiler intrinsics:
-</p>
-
-<blockquote><pre>
-__atomic_flag__
-__atomic_exchange_seq_cst(__atomic_flag__ volatile* obj, __atomic_flag__ desr)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    __atomic_flag__ result = *obj;
-    *obj = desr;
-    return result;
-}
-
-void
-__atomic_store_seq_cst(__atomic_flag__ volatile* obj, __atomic_flag__ desr)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    *obj = desr;
-}
-</pre></blockquote>
-
-<p>
-Where:
-</p>
-
-<blockquote><ul>
-<li>
-If <tt>__has_feature(__atomic_flag)</tt> evaluates to 1 in the preprocessor then
-the compiler must define <tt>__atomic_flag__</tt> (e.g. as a typedef to
-<tt>int</tt>).
-</li>
-<li>
-If <tt>__has_feature(__atomic_flag)</tt> evaluates to 0 in the preprocessor then
-the library defines <tt>__atomic_flag__</tt> as a typedef to <tt>bool</tt>.
-</li>
-<li>
-<p>
-To communicate that the above intrinsics are available, the compiler must
-arrange for <tt>__has_feature</tt> to return 1 when fed the intrinsic name
-appended with an '_' and the mangled type name of <tt>__atomic_flag__</tt>.
-</p>
-<p>
-For example if <tt>__atomic_flag__</tt> is <tt>unsigned int</tt>:
-</p>
-<blockquote><pre>
-__has_feature(__atomic_flag) == 1
-__has_feature(__atomic_exchange_seq_cst_j) == 1
-__has_feature(__atomic_store_seq_cst_j) == 1
-
-typedef unsigned int __atomic_flag__; 
-
-unsigned int __atomic_exchange_seq_cst(unsigned int volatile*, unsigned int)
-{
-   // ...
-}
-
-void __atomic_store_seq_cst(unsigned int volatile*, unsigned int)
-{
-   // ...
-}
-</pre></blockquote>
-</li>
-</ul></blockquote>
-
-<p>
-That's it!  Compiler writers do the above and you've got a fully conforming
-(though sub-par performance) <tt>&lt;atomic&gt;</tt> header!
-</p>
-
-<h2>Recommended work for a higher performance <tt>&lt;atomic&gt;</tt></h2>
-
-<p>
-It would be good if the above intrinsics worked with all integral types plus
-<tt>void*</tt>.  Because this may not be possible to do in a lock-free manner for
-all integral types on all platforms, a compiler must communicate each type that
-an intrinsic works with.  For example if <tt>__atomic_exchange_seq_cst</tt> works
-for all types except for <tt>long long</tt> and <tt>unsigned long long</tt>
-then:
-</p>
-
-<blockquote><pre>
-__has_feature(__atomic_exchange_seq_cst_b) == 1  // bool
-__has_feature(__atomic_exchange_seq_cst_c) == 1  // char
-__has_feature(__atomic_exchange_seq_cst_a) == 1  // signed char
-__has_feature(__atomic_exchange_seq_cst_h) == 1  // unsigned char
-__has_feature(__atomic_exchange_seq_cst_Ds) == 1 // char16_t
-__has_feature(__atomic_exchange_seq_cst_Di) == 1 // char32_t
-__has_feature(__atomic_exchange_seq_cst_w) == 1  // wchar_t
-__has_feature(__atomic_exchange_seq_cst_s) == 1  // short
-__has_feature(__atomic_exchange_seq_cst_t) == 1  // unsigned short
-__has_feature(__atomic_exchange_seq_cst_i) == 1  // int
-__has_feature(__atomic_exchange_seq_cst_j) == 1  // unsigned int
-__has_feature(__atomic_exchange_seq_cst_l) == 1  // long
-__has_feature(__atomic_exchange_seq_cst_m) == 1  // unsigned long
-__has_feature(__atomic_exchange_seq_cst_Pv) == 1 // void*
-</pre></blockquote>
-
-<p>
-Note that only the <tt>__has_feature</tt> flag is decorated with the argument
-type.  The name of the compiler intrinsic is not decorated, but instead works
-like a C++ overloaded function.
-</p>
-
-<p>
-Additionally there are other intrinsics besides
-<tt>__atomic_exchange_seq_cst</tt> and <tt>__atomic_store_seq_cst</tt>.  They
-are optional.  But if the compiler can generate faster code than provided by the
-library, then clients will benefit from the compiler writer's expertise and
-knowledge of the targeted platform.
-</p>
-
-<p>
-Below is the complete list of <i>sequentially consistent</i> intrinsics, and
-their library implementations.  Template syntax is used to indicate the desired
-overloading for integral and void* types.  The template does not represent a
-requirement that the intrinsic operate on <em>any</em> type!
-</p>
-
-<blockquote><pre>
-T is one of:  bool, char, signed char, unsigned char, short, unsigned short,
-              int, unsigned int, long, unsigned long,
-              long long, unsigned long long, char16_t, char32_t, wchar_t, void*
-
-template &lt;class T&gt;
-T
-__atomic_load_seq_cst(T const volatile* obj)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    return *obj;
-}
-
-template &lt;class T&gt;
-void
-__atomic_store_seq_cst(T volatile* obj, T desr)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    *obj = desr;
-}
-
-template &lt;class T&gt;
-T
-__atomic_exchange_seq_cst(T volatile* obj, T desr)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    T r = *obj;
-    *obj = desr;
-    return r;
-}
-
-template &lt;class T&gt;
-bool
-__atomic_compare_exchange_strong_seq_cst_seq_cst(T volatile* obj, T* exp, T desr)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    if (std::memcmp(const_cast&lt;T*&gt;(obj), exp, sizeof(T)) == 0)
-    {
-        std::memcpy(const_cast&lt;T*&gt;(obj), &amp;desr, sizeof(T));
-        return true;
-    }
-    std::memcpy(exp, const_cast&lt;T*&gt;(obj), sizeof(T));
-    return false;
-}
-
-template &lt;class T&gt;
-bool
-__atomic_compare_exchange_weak_seq_cst_seq_cst(T volatile* obj, T* exp, T desr)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    if (std::memcmp(const_cast&lt;T*&gt;(obj), exp, sizeof(T)) == 0)
-    {
-        std::memcpy(const_cast&lt;T*&gt;(obj), &amp;desr, sizeof(T));
-        return true;
-    }
-    std::memcpy(exp, const_cast&lt;T*&gt;(obj), sizeof(T));
-    return false;
-}
-
-T is one of:  char, signed char, unsigned char, short, unsigned short,
-              int, unsigned int, long, unsigned long,
-              long long, unsigned long long, char16_t, char32_t, wchar_t
-
-template &lt;class T&gt;
-T
-__atomic_fetch_add_seq_cst(T volatile* obj, T operand)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    T r = *obj;
-    *obj += operand;
-    return r;
-}
-
-template &lt;class T&gt;
-T
-__atomic_fetch_sub_seq_cst(T volatile* obj, T operand)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    T r = *obj;
-    *obj -= operand;
-    return r;
-}
-
-template &lt;class T&gt;
-T
-__atomic_fetch_and_seq_cst(T volatile* obj, T operand)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    T r = *obj;
-    *obj &amp;= operand;
-    return r;
-}
-
-template &lt;class T&gt;
-T
-__atomic_fetch_or_seq_cst(T volatile* obj, T operand)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    T r = *obj;
-    *obj |= operand;
-    return r;
-}
-
-template &lt;class T&gt;
-T
-__atomic_fetch_xor_seq_cst(T volatile* obj, T operand)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    T r = *obj;
-    *obj ^= operand;
-    return r;
-}
-
-void*
-__atomic_fetch_add_seq_cst(void* volatile* obj, ptrdiff_t operand)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    void* r = *obj;
-    (char*&amp;)(*obj) += operand;
-    return r;
-}
-
-void*
-__atomic_fetch_sub_seq_cst(void* volatile* obj, ptrdiff_t operand)
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-    void* r = *obj;
-    (char*&amp;)(*obj) -= operand;
-    return r;
-}
-
-void __atomic_thread_fence_seq_cst()
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-}
-
-void __atomic_signal_fence_seq_cst()
-{
-    unique_lock&lt;mutex&gt; _(some_mutex);
-}
-</pre></blockquote>
-
-<p>
-One should consult the (currently draft)
-<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3126.pdf">C++ standard</a>
-for the details of the definitions for these operations.  For example
-<tt>__atomic_compare_exchange_weak_seq_cst_seq_cst</tt> is allowed to fail
-spuriously while <tt>__atomic_compare_exchange_strong_seq_cst_seq_cst</tt> is
-not.
-</p>
-
-<p>
-If on your platform the lock-free definition of
-<tt>__atomic_compare_exchange_weak_seq_cst_seq_cst</tt> would be the same as
-<tt>__atomic_compare_exchange_strong_seq_cst_seq_cst</tt>, you may omit the
-<tt>__atomic_compare_exchange_weak_seq_cst_seq_cst</tt> intrinsic without a
-performance cost.  The library will prefer your implementation of
-<tt>__atomic_compare_exchange_strong_seq_cst_seq_cst</tt> over its own
-definition for implementing
-<tt>__atomic_compare_exchange_weak_seq_cst_seq_cst</tt>.  That is, the library
-will arrange for <tt>__atomic_compare_exchange_weak_seq_cst_seq_cst</tt> to call
-<tt>__atomic_compare_exchange_strong_seq_cst_seq_cst</tt> if you supply an
-intrinsic for the strong version but not the weak.
-</p>
-
-<h2>Taking advantage of weaker memory synchronization</h2>
-
-<p>
-So far all of the intrinsics presented require a <em>sequentially
-consistent</em> memory ordering.  That is, no loads or stores can move across
-the operation (just as if the library had locked that internal mutex).  But
-<tt>&lt;atomic&gt;</tt> supports weaker memory ordering operations.  In all,
-there are six memory orderings (listed here from strongest to weakest):
-</p>
-
-<blockquote><pre>
-memory_order_seq_cst
-memory_order_acq_rel
-memory_order_release
-memory_order_acquire
-memory_order_consume
-memory_order_relaxed
-</pre></blockquote>
-
-<p>
-(See the
-<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3126.pdf">C++ standard</a>
-for the detailed definitions of each of these orderings).
-</p>
-
-<p>
-On some platforms, the compiler vendor can offer some or even all of the above
-intrinsics at one or more weaker levels of memory synchronization.  This might
-lead for example to not issuing an <tt>mfence</tt> instruction on the x86.
-</p>
-
-<p>
-If the compiler does not offer any given operation, at any given memory ordering
-level, the library will automatically attempt to call the next highest memory
-ordering operation.  This continues up to <tt>seq_cst</tt>, and if that doesn't
-exist, then the library takes over and does the job with a <tt>mutex</tt>.  This
-is a compile-time search &amp; selection operation.  At run time, the
-application will only see the few inlined assembly instructions for the selected
-intrinsic.
-</p>
-
-<p>
-Each intrinsic is appended with the 7-letter name of the memory ordering it
-addresses.  For example a <tt>load</tt> with <tt>relaxed</tt> ordering is
-defined by:
-</p>
-
-<blockquote><pre>
-T __atomic_load_relaxed(const volatile T* obj);
-</pre></blockquote>
-
-<p>
-And announced with:
-</p>
-
-<blockquote><pre>
-__has_feature(__atomic_load_relaxed_b) == 1  // bool
-__has_feature(__atomic_load_relaxed_c) == 1  // char
-__has_feature(__atomic_load_relaxed_a) == 1  // signed char
-...
-</pre></blockquote>
-
-<p>
-The <tt>__atomic_compare_exchange_strong(weak)</tt> intrinsics are parameterized
-on two memory orderings.  The first ordering applies when the operation returns
-<tt>true</tt> and the second ordering applies when the operation returns
-<tt>false</tt>.
-</p>
-
-<p>
-Not every memory ordering is appropriate for every operation.  <tt>exchange</tt>
-and the <tt>fetch_<i>op</i></tt> operations support all 6.  But <tt>load</tt>
-only supports <tt>relaxed</tt>, <tt>consume</tt>, <tt>acquire</tt> and <tt>seq_cst</tt>.
-<tt>store</tt>
-only supports <tt>relaxed</tt>, <tt>release</tt>, and <tt>seq_cst</tt>.  The
-<tt>compare_exchange</tt> operations support the following 16 combinations out
-of the possible 36:
-</p>
-
-<blockquote><pre>
-relaxed_relaxed
-consume_relaxed
-consume_consume
-acquire_relaxed
-acquire_consume
-acquire_acquire
-release_relaxed
-release_consume
-release_acquire
-acq_rel_relaxed
-acq_rel_consume
-acq_rel_acquire
-seq_cst_relaxed
-seq_cst_consume
-seq_cst_acquire
-seq_cst_seq_cst
-</pre></blockquote>
-
-<p>
-Again, the compiler supplies intrinsics only for the strongest orderings where
-it can make a difference.  The library takes care of calling the weakest
-supplied intrinsic that is as strong or stronger than the customer asked for.
-</p>
-
-</div>
-</body>
-</html>
diff --git a/sources/cxx-stl/llvm-libc++/www/content.css b/sources/cxx-stl/llvm-libc++/www/content.css
deleted file mode 100644
index dca6a32..0000000
--- a/sources/cxx-stl/llvm-libc++/www/content.css
+++ /dev/null
@@ -1,27 +0,0 @@
-html { margin: 0px; } body { margin: 8px; }
-
-html, body {
-  padding:0px;
-  font-size:small; font-family:"Lucida Grande", "Lucida Sans Unicode", Arial, Verdana, Helvetica, sans-serif; background-color: #fff; color: #222;
-  line-height:1.5;
-}
-
-h1, h2, h3, tt { color: #000 }
-
-h1 { padding-top:0px; margin-top:0px;}
-h2 { color:#333333; padding-top:0.5em; }
-h3 { padding-top: 0.5em; margin-bottom: -0.25em; color:#2d58b7}
-li { padding-bottom: 0.5em; }
-ul { padding-left:1.5em; }
-
-/* Slides */
-IMG.img_slide {
-    display: block;
-    margin-left: auto;
-    margin-right: auto
-}
-
-.itemTitle { color:#2d58b7 }
-
-/* Tables */
-tr { vertical-align:top }
diff --git a/sources/cxx-stl/llvm-libc++/www/index.html b/sources/cxx-stl/llvm-libc++/www/index.html
deleted file mode 100644
index 091b0ba..0000000
--- a/sources/cxx-stl/llvm-libc++/www/index.html
+++ /dev/null
@@ -1,274 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-          "http://www.w3.org/TR/html4/strict.dtd">
-<!-- Material used from: HTML 4.01 specs: http://www.w3.org/TR/html401/ -->
-<html>
-<head>
-  <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-  <title>"libc++" C++ Standard Library</title>
-  <link type="text/css" rel="stylesheet" href="menu.css">
-  <link type="text/css" rel="stylesheet" href="content.css">
-</head>
-
-<body>
-<div id="menu">
-  <div>
-    <a href="http://llvm.org/">LLVM Home</a>
-  </div>
-
-  <div class="submenu">
-    <label>libc++ Info</label>
-    <a href="/index.html">About</a>
-  </div>
-
-  <div class="submenu">
-    <label>Quick Links</label>
-    <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev">cfe-dev</a>
-    <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits">cfe-commits</a>
-    <a href="http://llvm.org/bugs/">Bug Reports</a>
-    <a href="http://llvm.org/svn/llvm-project/libcxx/trunk/">Browse SVN</a>
-    <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/">Browse ViewVC</a>
-  </div>
-</div>
-
-<div id="content">
-  <!--*********************************************************************-->
-  <h1>"libc++" C++ Standard Library</h1>
-  <!--*********************************************************************-->
-
-  <p>libc++ is a new implementation of the C++ standard library, targeting
-     C++11.</p>
-
-  <p>All of the code in libc++ is <a
-     href="http://llvm.org/docs/DeveloperPolicy.html#license">dual licensed</a>
-     under the MIT license and the UIUC License (a BSD-like license).</p>
-
-  <!--=====================================================================-->
-  <h2 id="goals">Features and Goals</h2>
-  <!--=====================================================================-->
-
-    <ul>
-        <li>Correctness as defined by the C++11 standard.</li>
-        <li>Fast execution.</li>
-        <li>Minimal memory use.</li>
-        <li>Fast compile times.</li>
-        <li>ABI compatibility with gcc's libstdc++ for some low-level features
-            such as exception objects, rtti and memory allocation.</li>
-        <li>Extensive unit tests.</li>
-    </ul>
-
-  <!--=====================================================================-->
-  <h2 id="why">Why a new C++ Standard Library for C++11?</h2>
-  <!--=====================================================================-->
-
-  <p>After its initial introduction, many people have asked "why start a new
-     library instead of contributing to an existing library?" (like Apache's
-     libstdcxx, GNU's libstdc++, STLport, etc).  There are many contributing
-     reasons, but some of the major ones are:</p>
-
-  <ul>
-  <li><p>From years of experience (including having implemented the standard
-      library before), we've learned many things about implementing
-      the standard containers which require ABI breakage and fundamental changes
-      to how they are implemented.  For example, it is generally accepted that
-      building std::string using the "short string optimization" instead of
-      using Copy On Write (COW) is a superior approach for multicore
-      machines (particularly in C++11, which has rvalue references).  Breaking
-      ABI compatibility with old versions of the library was
-      determined to be critical to achieving the performance goals of
-      libc++.</p></li>
-
-  <li><p>Mainline libstdc++ has switched to GPL3, a license which the developers
-      of libc++ cannot use.  libstdc++ 4.2 (the last GPL2 version) could be
-      independently extended to support C++11, but this would be a fork of the
-      codebase (which is often seen as worse for a project than starting a new
-      independent one).  Another problem with libstdc++ is that it is tightly
-       integrated with G++ development, tending to be tied fairly closely to the
-       matching version of G++.</p>
-    </li>
-
-  <li><p>STLport and the Apache libstdcxx library are two other popular
-      candidates, but both lack C++11 support.  Our experience (and the
-      experience of libstdc++ developers) is that adding support for C++11 (in
-      particular rvalue references and move-only types) requires changes to
-      almost every class and function, essentially amounting to a rewrite.
-      Faced with a rewrite, we decided to start from scratch and evaluate every
-      design decision from first principles based on experience.</p>
-
-      <p>Further, both projects are apparently abandoned: STLport 5.2.1 was
-      released in Oct'08, and STDCXX 4.2.1 in May'08.</p>
-
-    </ul>
-
-  <!--=====================================================================-->
-  <h2 id="requirements">Platform Support</h2>
-  <!--=====================================================================-->
-
-   <p>libc++ is known to work on the following platforms, using g++-4.2 and
-      clang (lack of C++11 language support disables some functionality).</p>
-
-    <ul>
-     <li>Mac OS X i386</li>
-     <li>Mac OS X x86_64</li>
-    </ul>
-
-  <!--=====================================================================-->
-  <h2 id="dir-structure">Current Status</h2>
-  <!--=====================================================================-->
-
-   <p>libc++ is a 100% complete C++11 implementation on Apple's OS X. </p>
-   <p>LLVM and Clang can self host in C++ and C++11 mode with libc++ on Linux.</p>
-
-   <p>
-   Ports to other platforms are underway. Here are recent test
-   results for <a href="results.Windows.html">Windows</a>
-   and <a href="results.Linux.html">Linux</a>.
-   </p>
-
-  <!--=====================================================================-->
-  <h2>Get it and get involved!</h2>
-  <!--=====================================================================-->
-
-  <p>First please review our
-     <a href="http://llvm.org/docs/DeveloperPolicy.html">Developer's Policy</a>.
-
-  <p>To check out the code, use:</p>
-
-  <ul>
-  <li><code>svn co http://llvm.org/svn/llvm-project/libcxx/trunk libcxx</code></li>
-  </ul>
-
-  <p>
-     On Mac OS 10.7 (Lion) and later, the easiest way to get this library is to install
-     Xcode 4.2 or later.  However if you want to install tip-of-trunk from here
-     (getting the bleeding edge), read on.  However, be warned that Mac OS
-     10.7 will not boot without a valid copy of <code>libc++.1.dylib</code> in
-     <code>/usr/lib</code>.
-  </p>
-
-  <p>
-     Next:
-  </p>
-  
-  <ul>
-    <li><code>cd libcxx/lib</code></li>
-    <li><code>export TRIPLE=-apple-</code></li>
-    <li><code>./buildit</code></li>
-    <li><code>ln -sf libc++.1.dylib libc++.dylib</code></li>
-  </ul>
-  
-  <p>
-     That should result in a libc++.1.dylib and libc++.dylib.  The safest thing
-     to do is to use it from where your libcxx is installed instead of replacing
-     these in your Mac OS.
-  </p>
-
-  <p>
-  To use your system-installed libc++ with clang you can:
-  </p>
-
-  <ul>
-    <li><code>clang++ -stdlib=libc++ test.cpp</code></li>
-    <li><code>clang++ -std=c++11 -stdlib=libc++ test.cpp</code></li>
-  </ul>
-
-  <p>
-  To use your tip-of-trunk libc++ on Mac OS with clang you can:
-  </p>
-
-  <ul>
-    <li><code>export DYLD_LIBRARY_PATH=&lt;path-to-libcxx&gt;/lib</code>
-    <li><code>clang++ -std=c++11 -stdlib=libc++ -nostdinc++
-         -I&lt;path-to-libcxx&gt;/include -L&lt;path-to-libcxx&gt;/lib
-         test.cpp</code></li>
-  </ul>
-
-  <p>To run the libc++ test suite (recommended):</p>
-
-  <ul>
-  <li><code>cd libcxx/test</code></li>
-  <li><code>./testit</code></li>
-     <ul>
-       <li>You can alter the command line options <code>testit</code> uses
-       with <code>export OPTIONS="whatever you need"</code></li>
-     </ul>
-  </ul>
-
-  <!--=====================================================================-->
-  <h3>Notes</h3>
-  <!--=====================================================================-->
-
-<p>
-Building libc++ with <code>-fno-rtti</code> is not supported.  However linking
-against it with <code>-fno-rtti</code> is supported.
-</p>
-
-  <p>Send discussions to the
-  (<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev">clang mailing list</a>).</p>
-
-  <!--=====================================================================-->
-  <h2>Build on Linux using CMake and libsupc++.</h2>
-  <!--=====================================================================-->
-
-  <p>
-     You will need libstdc++ in order to provide libsupc++.
-  </p>
-  
-  <p>
-     Figure out where the libsupc++ headers are on your system. On Ubuntu this
-     is <code>/usr/include/c++/&lt;version&gt;</code> and
-     <code>/usr/include/c++/&lt;version&gt;/&lt;target-triple&gt;</code>
-  </p>
-  
-  <p>
-     You can also figure this out by running
-     <pre>
-$ echo | g++ -Wp,-v -x c++ - -fsyntax-only
-ignoring nonexistent directory "/usr/local/include/x86_64-linux-gnu"
-ignoring nonexistent directory "/usr/lib/gcc/x86_64-linux-gnu/4.7/../../../../x86_64-linux-gnu/include"
-#include "..." search starts here:
-#include &lt;...&gt; search starts here:
- /usr/include/c++/4.7
- /usr/include/c++/4.7/x86_64-linux-gnu
- /usr/include/c++/4.7/backward
- /usr/lib/gcc/x86_64-linux-gnu/4.7/include
- /usr/local/include
- /usr/lib/gcc/x86_64-linux-gnu/4.7/include-fixed
- /usr/include/x86_64-linux-gnu
- /usr/include
-End of search list.
-     </pre>
-
-      Note the first two entries happen to be what we are looking for. This
-      may not be correct on other platforms.
-  </p>
-  
-  <p>
-     We can now run CMake:
-     <ul>
-       <li><code>CC=clang CXX=clang++ cmake -G "Unix Makefiles"
-                -DLIBCXX_CXX_ABI=libsupc++
-                -DLIBCXX_LIBSUPCXX_INCLUDE_PATHS="/usr/include/c++/4.7/;/usr/include/c++/4.7/x86_64-linux-gnu/"
-                -DCMAKE_BUILD_TYPE=Release
-                -DCMAKE_INSTALL_PREFIX=/usr
-                &lt;libc++-source-dir&gt;</code></li>
-       <li><code>make</code></li>
-       <li><code>sudo make install</code></li>
-     </ul>
-     <p>
-        You can now run clang with -stdlib=libc++.
-     </p>
-  </p>
-
-  <!--=====================================================================-->
-  <h2>Design Documents</h2>
-  <!--=====================================================================-->
-
-<ul>
-<li><a href="atomic_design.html"><tt>&lt;atomic&gt;</tt></a></li>
-<li><a href="type_traits_design.html"><tt>&lt;type_traits&gt;</tt></a></li>
-<li><a href="http://marshall.calepin.co/llvmclang-and-standard-libraries-on-mac-os-x.html">Excellent notes by Marshall Clow</a></li>
-</ul>
-
-</div>
-</body>
-</html>
diff --git a/sources/cxx-stl/llvm-libc++/www/libcxx_by_chapter.pdf b/sources/cxx-stl/llvm-libc++/www/libcxx_by_chapter.pdf
deleted file mode 100644
index d29ef3e..0000000
--- a/sources/cxx-stl/llvm-libc++/www/libcxx_by_chapter.pdf
+++ /dev/null
Binary files differ
diff --git a/sources/cxx-stl/llvm-libc++/www/menu.css b/sources/cxx-stl/llvm-libc++/www/menu.css
deleted file mode 100644
index 4a887b1..0000000
--- a/sources/cxx-stl/llvm-libc++/www/menu.css
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************/
-/* page layout */
-/***************/
-
-[id=menu] {
-	position:fixed;
-	width:25ex;
-}
-[id=content] {
-	/* *****  EDIT THIS VALUE IF CONTENT OVERLAPS MENU ***** */
-	position:absolute;
-  left:29ex;
-	padding-right:4ex;
-}
-
-/**************/
-/* menu style */
-/**************/
-
-#menu .submenu {
-	padding-top:1em;
-	display:block;
-}
-
-#menu label {
-	display:block;
-	font-weight: bold;
-	text-align: center;
-	background-color: rgb(192,192,192);
-}
-#menu a {
-	padding:0 .2em;
-	display:block;
-	text-align: center;
-	background-color: rgb(235,235,235);
-}
-#menu a:visited {
-	color:rgb(100,50,100);
-}
diff --git a/sources/cxx-stl/llvm-libc++/www/results.Linux.html b/sources/cxx-stl/llvm-libc++/www/results.Linux.html
deleted file mode 100644
index 5e3eaf1..0000000
--- a/sources/cxx-stl/llvm-libc++/www/results.Linux.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>results.Linux</title>
-</head>
-<body>
-<pre>
-
-All failures in the libc++ test suite will be documented here. Last
-run was with Clang (pre-3.2) on Debian unstable x86_64 with eglibc
-2.13 and kernel 3.2.0-3-amd64. The ABI library used was libc++abi.
-
-depr/
- depr.c.headers/
-  math_h.pass.cpp: Fails a static assert that the return type of
-   isnan(double) and isinf(double) is a bool.
- uchar_h.pass.cpp:
-   My libc doesn't seem to provide uchar.h yet.
- exception.unexpected/
-  set.unexpected/
-   get_unexpected.pass.cpp: This seems to be a problem with libc++abi:
-    its default unexpected handler does not call the terminate handler?
-   set_unexpected.pass.cpp: idem.
-diagnostics/
- syserr/
-  syserr.errcat/
-   syserr.errcat.objects/
-    system_category.pass.cpp: Always maps back to generic category
-     when it should stay system category, because the implementation
-     dependson ELAST, which Linux lacks.
-input.output/
- iostream.format/
-  ext.manip/
-   get_time.pass.cpp: Local representation is 'Sat 31 Dec 2061
-    11:55:59 PM EST' which does not match the expected result in the
-    test.
-   put_time.pass.cpp: idem.
-language.support/
- support.start.term/
-  quick_exit.pass.cpp: Fails because it doesn't know about
-   std::at_quick_exit. Interestingly my libc does seem to know about
-   std::[at_]quick_exit, so this needs some investigation.
-localization/
- locale.categories/
-  category.collate/
-   locale.collate.byname/
-    compare.pass.cpp: In the C local, sorting order seems OK, but not
-     in the &quot&quot and en UTF8 locals. Needs investigation.
-  category.ctype/
-   locale.codecvt/
-    locale.codecvt.members/
-     wchar_t_out.pass.cpp: Needs investigation.
-    widen_1.pass.cpp: Fails due to not converting some out of bounds
-     characters the same way as expected. Needs investigation.
-    widen_many.pass.cpp: idem.
-  category.monetary/
-   locale.money.get/
-    locale.money.get.members/
-     get_long_double_ru_RU.pass.cpp: Needs investigation.
-     get_long_double_zh_CN.pass.cpp: idem.
-    locale.money.put.members/
-     put_long_double_ru_RU.pass.cpp: idem.
-     put_long_double_zh_CN.pass.cpp: idem.
-   locale.moneypunct.byname/
-    decimal_point.pass.cpp: Expects ',' for RU, but gets '.'.
-    thousands_sep.pass.cpp: idem.
-  category.numeric/
-   locale.nm.put/
-    facet.num.put.members/
-     put_long_double.pass.cpp: Fails due to getting '+nan' rather
-      than just 'nan'.
-  category.time/
-   locale.time.get.byname/
-    get_date.pass.cpp: Needs investigation.
-    get_date_wide.pass.cpp: idem.
-    get_monthname.pass.cpp: idem.
-    get_monthname_wide.pass.cpp: idem.
-    get_one.pass.cpp: idem.
-    get_one_wide.pass.cpp: idem.
-    get_weekday.pass.cpp: idem.
-    get_weekday_wide.pass.cpp: idem.
-   locale.time.put.byname/
-    put1.pass.cpp: idem.
-   locale.time.put/
-    locale.time.put.members/
-     put2.pass.cpp: idem.
-  facet.numpunct/
-   locale.numpunct.byname/
-    grouping.pass.cpp: idem.
-    thousands_sep.pass.cpp: idem.
-numerics/
- c.math/
-  cmath.pass.cpp: Fails for same reason as depr/depr.c.headers/math_h.pass.cpp
-re/
- re.alg/
-  re.alg.match/
-   awk.pass.cpp: Needs investigation.
-   basic.pass.cpp: idem.
-   ecma.pass.cpp: idem.
-   extended.pass.cpp: idem.
-  re.alg.search/
-   awk.pass.cpp: idem.
-   basic.pass.cpp: idem.
-   ecma.pass.cpp: idem.
-   extended.pass.cpp: idem.
- re.traits/
-  lookup_collatename.pass.cpp: idem.
-strings/
- c.strings/
-  cuchar.pass.cpp: Can't find cuchar header
-  version_cuchar.pass.cpp: idem.
-utilities/
- memory/
-  unique.ptr/
-   unique.ptr.runtime/
-    unique.ptr.runtime.ctor/
-     default02.pass.cpp:
-      test previously passed, recently started crashing clang. Needs investigation.
-     pointer02.pass.cpp: idem.
-</pre>
-</body>
-</html>
diff --git a/sources/cxx-stl/llvm-libc++/www/results.Windows.html b/sources/cxx-stl/llvm-libc++/www/results.Windows.html
deleted file mode 100644
index a5ec121..0000000
--- a/sources/cxx-stl/llvm-libc++/www/results.Windows.html
+++ /dev/null
@@ -1,487 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>results.Windows</title>
-</head>
-<body>
-<pre>
-All failures in the libc++ test suite will be documented here.
-
-Last run was with Clang (pre-3.1) and GCC 4.6.3 (with dw2 exception handling) and
- mingw-w64 v2.0.3 on i686-w64-mingw32.
-
-The following line was added to ./lib/buildit to make a static libc++ library because a DLL requires "declspec(dllexport)" or a .def file:
-ar rcs libc++.a *.o
-I also deleted libc++.dll and libc++.dll.a to make sure libc++ was linked statically to prevent unrelated issues from contaminating the test results.
-The commands to build and test were (-nodefaultlibs does not work, lots of MinGW related stuff gets left out resulting in linker failures):
-TRIPLE=i686-w64-mingw32 ./buildit
-TRIPLE=i686-w64-mingw32 HEADER_INCLUDE="-I/home/Ruben/libcxx/include" LIBS="-L/home/ruben/libcxx/lib -lc++ -lpthread -lsupc++ -lmsvcr100 -Wl,--allow-multiple-definition" ./testit > test.log 2>&1
-
-Note: Some locale tests may "Need investigating", but I think most problems are
-      caused by wrong/unportable locale naming in the tests.
-Note: Some tests failed to link because "test.exe" was still running when ld.exe
-      tried to link the next test. I left these failures out of the list; they
-      account for about 10-30 failures, and are counted in the total scores below.
-      I reran some of these failures manually and they passed.
-Note: Some tests fail at runtime but pass when run manually. Usage of std::cout
-      segfaults so further investigation is difficult. These also contribute to
-      the failures total, but are left out of the failure list, as the cause is
-      probably not located in that part of libc++, not locatable due to the lack
-      of usable debug info generated by Clang at this time.
-
-TOTAL RESULTS:
-Section failures / total sections: 104 / 1064 = 9.8% failures
-Test failures / total number of tests: 292 / 4326 = 6.7% failures
-
-depr/
- depr.c.headers/
-  inttypes_h.pass.cpp: missing macros for C++.
-  uchar_h.pass.cpp: bug in mingw-w64 headers for C++11 builtin char types.
-  wchar_h.pass.cpp: Windows does not have swprintf, should use _snwprintf.
-                    Suggest #define swprintf as _snwprintf for _WIN32.
-exception.unexpected/
-   set.unexpected/
-    get_unexpected.pass.cpp: Segmentation fault - needs investigation.
-    set_unexpected.pass.cpp: idem.
-diagnostics/
- syserr/
-  syserr.errcat/
-   syserr.errcat.objects/
-    system_category.pass.cpp: Needs investigation.
-input.output/
- file.streams/
-  c.files/
-   cinttypes.pass.cpp: missing macros for C++.
-  fstreams/
-   filebuf.assign/
-    member_swap.pass.cpp: Segmentation fault - needs investigation.
-    move_assign.pass.cpp: idem.
-    nonmember_swap.pass.cpp: idem.
-   filebuf.cons/
-    move.pass.cpp: idem.
-   filebuf.members/
-    open_pointers.pass.cpp: idem.
-   filebuf.virtuals/
-    overflow.pass.cpp: idem.
-    pbackfail.pass.cpp: idem.
-    seekoff.pass.cpp: idem.
-    underflow.pass.cpp: idem.
-   fstream.assign/
-    member_swap.pass.cpp: idem.
-    move_assign.pass.cpp: idem.
-    nonmember_swap.pass.cpp: idem.
-   fstream.cons/
-    move.pass.cpp: idem.
-    pointer.pass.cpp: idem.
-    string.pass.cpp: idem.
-   fstream.members/
-    open_pointer.pass.cpp: idem.
-    open_string.pass.cpp: idem.
-   ifstream.assign/
-    member_swap.pass.cpp: idem.
-    move_assign.pass.cpp: idem.
-    nonmember_swap.pass.cpp: idem.
-   ifstream.cons/
-    move.pass.cpp: idem.
-    pointer.pass.cpp: idem.
-    string.pass.cpp: idem.
-   ifstream.members/
-    open_pointer.pass.cpp: idem.
-    open_string.pass.cpp: idem.
-	  rdbuf.pass.cpp: idem.
-   ofstream.assign/
-    member_swap.pass.cpp: idem.
-    move_assign.pass.cpp: idem.
-    nonmember_swap.pass.cpp: idem.
-   ofstream.cons/
-    move.pass.cpp: idem.
-    pointer.pass.cpp: idem.
-    string.pass.cpp: idem.
-   ofstream.members/
-    open_pointer.pass.cpp: idem.
-    open_string.pass.cpp: idem.
-	  rdbuf.pass.cpp: idem.
- iostream.format/
-  ext.manip
-   get_money.pass.cpp: Windows locale names don't follow UNIX convention.
-   get_time.pass.cpp: idem.
-   put_money.pass.cpp: idem.
-   put_time.pass.cpp: idem.
-  output.streams/
-   ostream.formatted/
-    ostream.inserters.arithmetic/
-     long_double.pass.cpp: Segfault - needs investigation.
-     pointer.pass.cpp: idem.
-   ostream_sentry/
-    destruct.pass.cpp: idem.
- iostream.objects/
-  narrow.stream.objects/
-   cerr.pass.cpp: idem.
-   cin.pass.cpp: idem.
-  wide.stream.objects/
-   wcerr.pass.cpp: idem.
-   wcin.pass.cpp: idem.
- iostreams.base/
-  ios/
-   basic.ios.members/
-    copyfmt.pass.cpp: Windows locale names don't follow UNIX convention.
-    imbue.pass.cpp: idem.
-    move.pass.cpp: idem.
-    swap.pass.cpp: Windows locale names don't follow UNIX convention.
-  ios.base/
-   ios.base.callback/
-    register_callback.pass.cpp: Windows locale names don't follow UNIX convention.
-   ios.base.locales/
-    imbue.pass.cpp: Windows locale names don't follow UNIX convention.
- stream.buffers/
-  streambuf/
-   streambuf.cons/
-    copy.pass.cpp: Windows locale names don't follow UNIX convention.
-    default.pass.cpp: idem.
-   streambuf.members/
-    streambuf.buffer/
-     locales.pass.cpp: Windows locale names don't follow UNIX convention.
-   streambuf.protected/
-    streambuf.assign/
-	   assign.pass.cpp: Windows locale names don't follow UNIX convention.
-     swap.pass.cpp: idem.
-language.support/
- support.exception/
-  except.nested/
-   assign.pass.cpp: Needs investigation.
-   ctor_copy.pass.cpp: idem.
-   ctor_default.pass.cpp: idem.
-   rethrow_if_nested.pass.cpp: idem.
-   rethrow_nested.pass.cpp: idem.
-   throw_with_nested.pass.cpp: idem.
-  propagation/
-   current_exception.pass.cpp: Needs investigation.
-   exception_ptr.pass.cpp: idem.
-   make_exception_ptr.pass.cpp: idem.
-   rethrow_exception.pass.cpp: idem.
-  uncaught/
-   uncaught_exception.pass.cpp: Needs investigation.
- support.limits/
-  limits/
-   numeric.limits.members/
-    digits.pass.cpp: Needs investigation (wrong assumptions?).
-    digits10.pass.cpp: idem.
- support.runtime/
-  support.start.term/
-   quick_exit.pass.cpp: Not declared in libc++ headers. Is it from the ABI lib?
- support.types/
-  max_align_t.pass.cpp: needs investigation (wrong assumptions?).
-localization/
- locale.categories/
-  category.collate/
-   locale.collate.byname/
-    compare.pass.cpp: Windows locale names don't follow UNIX convention.
-    hash.pass.cpp: idem.
-    transform.pass.cpp: getenv should be replaced by putenv for portability.
-                        Windows locale names don't follow UNIX convention.
-    types.pass.cpp: Windows locale names don't follow UNIX convention.
- locale.categories/
-  category.ctype/
-   locale.codecvt/
-    locale.codecvt.members/
-     wchar_t_in.pass.cpp: Most likely wchar_t is assumed 4 bytes.
-     wchar_t_length.pass.cpp: idem.
-     wchar_t_out.pass.cpp: idem.
-     wchar_t_unshift.pass.cpp: idem.
-   locale.codecvt.byname/
-    ctor_wchar_t.pass.cpp: Windows locale names don't follow UNIX convention.
-   locale.ctype.byname/
-    is_1.pass.cpp: Windows locale names don't follow UNIX convention.
-    is_many.pass.cpp: idem.
-    narrow_1.pass.cpp: idem.
-    narrow_many.pass.cpp: idem.
-    scan_is.pass.cpp: idem.
-    scan_not.pass.cpp: idem.
-    tolower_1.pass.cpp: idem.
-    tolower_many.pass.cpp: idem.
-    toupper_1.pass.cpp: idem.
-    toupper_many.pass.cpp: idem.
-    types.pass.cpp: idem.
-    widen_1.pass.cpp: idem.
-    widen_many.pass.cpp: idem.
-  category.monetary/
-   locale.money.get/
-    locale.money.get.members/
-     get_long_double_en_US.pass.cpp: Windows locale names don't follow UNIX convention.
-     get_long_double_fr_FR.pass.cpp: idem.
-     get_long_double_ru_RU.pass.cpp: idem.
-     get_long_double_zh_CN.pass.cpp: idem.
-     get_string_en_US.pass.cpp: idem.
-   locale.money.put/
-    locale.money.put.members/
-	 put_long_double_en_US.pass.cpp: Windows locale names don't follow UNIX convention.
-     put_long_double_fr_FR.pass.cpp: idem.
-     put_long_double_ru_RU.pass.cpp: idem.
-     put_long_double_zh_CN.pass.cpp: idem.
-     put_string_en_US.pass.cpp: idem.
-   locale.moneypunct.byname/
-     curr_symbol.pass.cpp: Failed constructing from C locale. Needs investigation.
-     decimal_point.pass.cpp: idem.
-     frac_digits.pass.cpp: idem.
-     grouping.pass.cpp: idem.
-     neg_format.pass.cpp: idem.
-     negative_sign.pass.cpp: idem.
-     pos_format.pass.cpp: idem.
-     positive_sign.pass.cpp: idem.
-     thousands_sep.pass.cpp: idem.
-  category.numeric/
-   locale.nm.put/
-    facet.num.put.members/
-     put_double.pass.cpp: idem. (different floating point format?)
-     put_long_double.pass.cpp: idem.
-     put_pointer.pass.cpp: idem.
-   locale.num.get/
-    facet.num.get.members/
-     get_double.pass.cpp: Needs investigating.
-     get_float.pass.cpp: idem.
-     get_long_double.pass.cpp: idem.
-     get_pointer.pass.cpp: idem.
-  category.time/
-   locale.time.get/
-    locale.time.get.byname/
-     date_order.pass.cpp: Windows locale names don't follow UNIX convention.
-     date_order_wide.pass.cpp: idem.
-     get_date.pass.cpp: idem.
-     get_date_wide.pass.cpp: idem.
-     get_monthname.pass.cpp: idem.
-     get_monthname_wide.pass.cpp: idem.
-     get_one.pass.cpp: idem.
-     get_one_wide.pass.cpp: idem.
-     get_time.pass.cpp: idem.
-     get_time_wide.pass.cpp: idem.
-     get_weekday.pass.cpp: idem.
-     get_weekday_wide.pass.cpp: idem.
-     get_year.pass.cpp: idem.
-     get_year_wide.pass.cpp: idem.
-   locale.time.put/
-    locale.time.put.members/
-     put1.pass.cpp: Needs investigating.
-     put2.pass.cpp: idem.
-    locale.time.put.byname/
-     put1.pass.cpp: Windows locale names don't follow UNIX convention.
-   facet.numpunct/
-    locale.numpunct/
-     locale.numpunct.byname/
-      decimal_point.pass.cpp: Failed constructing from C locale. Needs investigation.
-      grouping.pass.cpp: idem.
-      thousands_sep.pass.cpp: idem.
- locale.stdcvt/
-  codecvt_utf16_in.pass.cpp: 0x40003 does not fit in a 2-byte wchar_t.
-  codecvt_utf16_out.pass.cpp: idem.
-  codecvt_utf8_in.pass.cpp: idem.
-  codecvt_utf8_out.pass.cpp: idem.
-  codecvt_utf8_utf16_in.pass: idem.
-  codecvt_utf8_utf16_out.pass.cpp: idem.
- locales/
-  locale/
-   locale.cons/
-    assign.pass.cpp: Windows locale names don't follow UNIX convention.
-    char_pointer.pass.cpp: idem.
-    copy.pass.cpp: idem.
-    default.pass.cpp: idem.
-    locale_char_pointer_cat.pass.cpp: idem.
-    locale_facetptr.pass.cpp: idem.
-    locale_locale_cat.pass.cpp: idem.
-    locale_string_cat.pass.cpp: idem.
-    string.pass.cpp: idem.
-   locale.members/
-    name.pass.cpp: Windows locale names don't follow UNIX convention.
-   locale.operators/
-    eq.pass.cpp: Windows locale names don't follow UNIX convention.
-   locale/locale.statics/
-    classic.pass.cpp: Failed constructing from C locale. Needs investigation.
-    global.pass.cpp: Windows locale names don't follow UNIX convention.
-   locale.convenience/
-    conversions/
-     conversions.buffer/
-      overflow.pass.cpp: Needs investigation.
-      pbackfail.pass.cpp: idem.
-      seekoff.pass.cpp: idem.
-      test.pass.cpp: idem.
-      underflow.pass.cpp: idem.
-     conversions.string/
-      converted.pass.cpp: out of range hex sequence due to 2-byte wchar_t.
-      from_bytes.pass.cpp: idem (This test passed while it probably shouldn't!).
-      to_bytes.pass.cpp: idem.
-numerics/
- complex.number/
-  complex.value.ops/
-   abs.pass.cpp: Failed assertion.
-   arg.pass.cpp: idem.
- rand/
-  rand.device/
-   ctor.pass.cpp: No such thing as /dev/urandom on Windows. Need alternative.
-   entropy.pass.cpp: idem.
-   eval.pass.cpp: idem.
-  rand.dis/
-   rand.dist.bern/
-    rand.dist.bern.bernoulli/
-     io.pass.cpp: Needs investigation. (different output double format?)
-    rand.dist.bern.bin/
-     io.pass.cpp: Needs investigation. (different output double format?)
-    rand.dist.bern.geo/
-     io.pass.cpp: Needs investigation. (different output double format?)
-    rand.dist.bern.negbin/
-     io.pass.cpp: Needs investigation. (different output double format?)
-   rand.dist.norm/
-	  rand.dist.norm.cauchy/
-     io.pass.cpp: Needs investigation. (different output double format?)
-	  rand.dist.norm.chisq/
-     io.pass.cpp: Needs investigation. (different output double format?)
-	  rand.dist.norm.norm.f/
-     io.pass.cpp: Needs investigation. (different output double format?)
-	  rand.dist.norm.lognormal/
-     io.pass.cpp: Needs investigation. (different output double format?)
-	  rand.dist.norm.normal/
-     io.pass.cpp: Needs investigation. (different output double format?)
-	  rand.dist.norm.t/
-     io.pass.cpp: Needs investigation. (different output double format?)
-   rand.dist.pois/
-    rand.dist.pois.exp/
-     io.pass.cpp: Needs investigation. (different output double format?)
-    rand.dist.pois.extreme/
-     io.pass.cpp: Needs investigation. (different output double format?)
-    rand.dist.pois.gamma/
-     io.pass.cpp: Needs investigation. (different output double format?)
-    rand.dist.pois.poisson/
-     io.pass.cpp: Needs investigation. (different output double format?)
-    rand.dist.pois.weibull/
-     io.pass.cpp: Needs investigation. (different output double format?)
-   rand.dist.samp/
-    rand.dist.samp.discrete/
-     io.pass.cpp: Needs investigation. (different output double format?)
-    rand.dist.samp.pconst/
-     io.pass.cpp: Needs investigation. (different output double format?)
-    rand.dist.samp.plinear/
-     io.pass.cpp: Needs investigation. (different output double format?)
-   rand.dist.uni/
-    rand.dist.uni.real/
-     io.pass.cpp: Needs investigation. (different output double format?)
-re/
- re.alg/
-  re.alg.match/
-   awk.pass.cpp: Needs investigation.
-   basic.pass.cpp: idem.
-   ecma.pass.cpp: idem.
-   extended.pass.cpp: idem.
-  re.alg.search/
-   awk.pass.cpp: Needs investigation.
-   basic.pass.cpp: idem.
-   ecma.pass.cpp: idem.
-   extended.pass.cpp: idem.
- re.regex/
-  re.regex.locale/
-   imbue.pass.cpp: Windows locale names don't follow UNIX convention.
- re.traits/
-  default.pass.cpp: Windows locale names don't follow UNIX convention.
-  getloc.pass.cpp: idem.
-  imbue.pass.cpp: idem.
-  isctype.pass.cpp: Needs investigation.
-  lookup_classname.pass.cpp: idem.
-  lookup_collatename.pass.cpp: Windows locale names don't follow UNIX convention.
-  transform.pass.cpp: idem.
-  transform_primary.pass.cpp: idem
-  translate_nocase.pass.cpp: Needs investigation.
-strings/
- c.strings/
-  cuchar.pass.cpp: see previous note about uchar.h.
-  cwchar.pass.cpp: I suggest including the win32 support header which defines
-                   (v)swprintf to the Windows equivalent.
-  version_cuchar.pass.cpp: see previous note about uchar.h.
- string.conversions/
-  stod.pass.cpp: "no conversion". Needs investigation.
-  stof.pass.cpp: idem.
-  to_string.pass.cpp: Needs investigation.
-  to_wstring.pass.cpp: idem.
-thread/
- futures/
-  futures.async/
-   async.pass.cpp: Needs investigation.
-  futures.promise/
-   alloc_ctor.pass.cpp: Needs investigation.
-   default.pass.cpp: idem.
-   dtor.pass.cpp: idem.
-   get_future.pass.cpp: idem.
-   move_assign.pass.cpp: idem.
-   move_ctor.pass.cpp: idem.
-   set_exception.pass.cpp: idem.
-   set_exception_at_thread_exit.pass.cpp: idem.
-   set_lvalue.pass.cpp: idem.
-   set_lvalue_at_thread_exit.pass.cpp: idem.
-   set_rvalue.pass.cpp: idem.
-   set_rvalue_at_thread_exit.pass.cpp: idem.
-   set_value_at_thread_exit_const.pass.cpp: idem.
-   set_value_at_thread_exit_void.pass.cpp: idem.
-   set_value_const.pass.cpp: idem.
-   set_value_void.pass.cpp: idem.
-   swap.pass.cpp: idem.
-  futures.shared_future/
-   copy_assign.pass.cpp: Needs investigation.
-   copy_ctor.pass.cpp: idem.
-   ctor_future.pass.cpp: idem.
-   dtor.pass.cpp: idem.
-   get.pass.cpp: idem.
-   move_assign.pass.cpp: idem.
-   move_ctor.pass.cpp: idem.
-   wait.pass.cpp: idem.
-   wait_for.pass.cpp: idem.
-   wait_until.pass.cpp: idem.
-  futures.tas/
-   futures.task.members/
-    assign_move.pass.cpp: Needs investigation.
-    ctor_func.pass.cpp: idem.
-    ctor_func_alloc.pass.cpp: idem.
-    ctor_move.pass.cpp: idem.
-    dtor.pass.cpp: idem.
-    get_future.pass.cpp: idem.
-    make_ready_at_thread_exit.pass.cpp: idem.
-    operator.pass.cpp: idem.
-    reset.pass.cpp: idem.
-    swap.pass.cpp: idem.
-   futures.task.nonmembers/
-    swap.pass.cpp: Needs investigation.
-   futures.unique_future/
-    dtor.pass.cpp: Needs investigation.
-    get.pass.cpp: idem.
-    move_assign.pass.cpp: idem.
-    move_ctor.pass.cpp: idem.
-    share.pass.cpp: idem.
-    wait.pass.cpp: idem.
-    wait_for.pass.cpp: idem.
-    wait_until.pass.cpp: idem.
- thread.condition/
-  thread.condition.condvar/
-   wait_for.pass.cpp: Needs investigation.
-  thread.condition.condvarany/
-   wait_for.pass.cpp: Needs investigation.
- thread.mutex/
-  thread.lock/
-   thread.lock.unique/
-    thread.lock.unique.cons/
-     mutex_try_to_lock.pass.cpp: Needs investigation.
- thread.threads/
-  thread.thread.class/
-   thread.thread.constr/
-    move.pass.cpp: Needs investigation.
-   thread.thread.id/
-    join.pass.cpp: Needs investigation.
-   thread.thread.static/
-    hardware_concurrency.pass.cpp: Needs investigation.
-utilities/
- meta/
-  meta.trans/
-   meta.trans.other/
-    aligned_storage.pass.cpp: Probably due to sizeof(long) != 8.
-   meta.trans.sign/
-    make_signed.pass.cpp: Probably due to sizeof(wchar_t) != 4.
-    make_unsigned.pass.cpp: idem.
-   meta.unary.prop.query/
-    alignment_of.pass.cpp: Probably a Clang problem on Windows.
-</pre>
-</body>
-</html>
diff --git a/sources/cxx-stl/llvm-libc++/www/type_traits_design.html b/sources/cxx-stl/llvm-libc++/www/type_traits_design.html
deleted file mode 100644
index ea173a8..0000000
--- a/sources/cxx-stl/llvm-libc++/www/type_traits_design.html
+++ /dev/null
@@ -1,286 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-          "http://www.w3.org/TR/html4/strict.dtd">
-<!-- Material used from: HTML 4.01 specs: http://www.w3.org/TR/html401/ -->
-<html>
-<head>
-  <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-  <title>type traits intrinsic design</title>
-  <link type="text/css" rel="stylesheet" href="menu.css">
-  <link type="text/css" rel="stylesheet" href="content.css">
-</head>
-
-<body>
-<div id="menu">
-  <div>
-    <a href="http://llvm.org/">LLVM Home</a>
-  </div>
-
-  <div class="submenu">
-    <label>libc++ Info</label>
-    <a href="/index.html">About</a>
-  </div>
-
-  <div class="submenu">
-    <label>Quick Links</label>
-    <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev">cfe-dev</a>
-    <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits">cfe-commits</a>
-    <a href="http://llvm.org/bugs/">Bug Reports</a>
-    <a href="http://llvm.org/svn/llvm-project/libcxx/trunk/">Browse SVN</a>
-    <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/">Browse ViewVC</a>
-  </div>
-</div>
-
-<div id="content">
-  <!--*********************************************************************-->
-  <h1>Type traits intrinsic design</h1>
-  <!--*********************************************************************-->
-
-<p>
-This is a survey of the type traits intrinsics clang has, and those needed.
-The names and definitions of several of the needed type traits has recently
-changed.  Please see:
-<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3142.html">N3142</a>.
-</p>
-
-<blockquote>
-<table border="1">
-<caption>Legend</caption>
-
-<tr>
-<td>clang supplies it and it is absolutely necessary</td>
-<td bgcolor="#80FF80"><tt>some_trait(T)</tt></td>
-</tr>
-
-<tr>
-<td>clang supplies it and it is useful</td>
-<td bgcolor="#96B9FF"><tt>some_trait(T)</tt></td>
-</tr>
-
-<tr>
-<td>clang supplies it and it is not needed</td>
-<td><tt>some_trait(T)</tt></td>
-</tr>
-
-<tr>
-<td>clang does not supply it and it is not needed</td>
-<td></td>
-</tr>
-
-<tr>
-<td>clang does not supply it and it is absolutely necessary</td>
-<td bgcolor="#FF5965"><tt>some_trait(T)</tt></td>
-</tr>
-
-</table>
-
-<p></p>
-
-<table border="1">
-<caption>Needed type traits vs clang type traits</caption>
-
-<tr>
-<th>libc++ Needs</th>
-<th>clang Has</th>
-</tr>
-
-<tr>
-<td><tt>is_union&lt;T&gt;</tt></td>
-<td bgcolor="#80FF80"><tt>__is_union(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_class&lt;T&gt;</tt></td>
-<td bgcolor="#96B9FF"><tt>__is_class(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_enum&lt;T&gt;</tt></td>
-<td bgcolor="#96B9FF"><tt>__is_enum(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_pod&lt;T&gt;</tt></td>
-<td bgcolor="#80FF80"><tt>__is_pod(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>has_virtual_destructor&lt;T&gt;</tt></td>
-<td bgcolor="#80FF80"><tt>__has_virtual_destructor(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_constructible&lt;T, Args...&gt;</tt></td>
-<td></td>
-</tr>
-
-<tr>
-<td><tt>is_default_constructible&lt;T&gt;</tt></td>
-<td></td>
-</tr>
-
-<tr>
-<td><tt>is_copy_constructible&lt;T&gt;</tt></td>
-<td></td>
-</tr>
-
-<tr>
-<td><tt>is_move_constructible&lt;T&gt;</tt></td>
-<td></td>
-</tr>
-
-<tr>
-<td><tt>is_assignable&lt;T, U&gt;</tt></td>
-<td></td>
-</tr>
-
-<tr>
-<td><tt>is_copy_assignable&lt;T&gt;</tt></td>
-<td></td>
-</tr>
-
-<tr>
-<td><tt>is_move_assignable&lt;T&gt;</tt></td>
-<td></td>
-</tr>
-
-<tr>
-<td><tt>is_destructible&lt;T&gt;</tt></td>
-<td></td>
-</tr>
-
-<tr>
-<td><tt>is_trivially_constructible&lt;T, Args...&gt;</tt></td>
-<td bgcolor="#80FF80"><tt>__is_trivially_constructible(T, U)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_trivially_default_constructible&lt;T&gt;</tt></td>
-<td bgcolor="#80FF80"><tt>__has_trivial_constructor(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_trivially_copy_constructible&lt;T&gt;</tt></td>
-<td><tt>__has_trivial_copy(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_trivially_move_constructible&lt;T&gt;</tt></td>
-<td></td>
-</tr>
-
-<tr>
-<td><tt>is_trivially_assignable&lt;T, U&gt;</tt></td>
-<td bgcolor="#80FF80"><tt>__is_trivially_assignable(T, U)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_trivially_copy_assignable&lt;T&gt;</tt></td>
-<td><tt>__has_trivial_assign(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_trivially_move_assignable&lt;T&gt;</tt></td>
-<td></td>
-</tr>
-
-<tr>
-<td><tt>is_trivially_destructible&lt;T&gt;</tt></td>
-<td bgcolor="#80FF80"><tt>__has_trivial_destructor(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_nothrow_constructible&lt;T, Args...&gt;</tt></td>
-<td></td>
-</tr>
-
-<tr>
-<td><tt>is_nothrow_default_constructible&lt;T&gt;</tt></td>
-<td><tt>__has_nothrow_constructor(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_nothrow_copy_constructible&lt;T&gt;</tt></td>
-<td><tt>__has_nothrow_copy(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_nothrow_move_constructible&lt;T&gt;</tt></td>
-<td></td>
-</tr>
-
-<tr>
-<td><tt>is_nothrow_assignable&lt;T, U&gt;</tt></td>
-<td></td>
-</tr>
-
-<tr>
-<td><tt>is_nothrow_copy_assignable&lt;T&gt;</tt></td>
-<td><tt>__has_nothrow_assign(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_nothrow_move_assignable&lt;T&gt;</tt></td>
-<td></td>
-</tr>
-
-<tr>
-<td><tt>is_nothrow_destructible&lt;T&gt;</tt></td>
-<td></td>
-</tr>
-
-<tr>
-<td><tt>is_trivial&lt;T&gt;</tt></td>
-<td bgcolor="#80FF80"><tt>__is_trivial(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_trivially_copyable&lt;T&gt;</tt></td>
-<td bgcolor="#80FF80"><tt>__is_trivially_copyable(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_standard_layout&lt;T&gt;</tt></td>
-<td bgcolor="#80FF80"><tt>__is_standard_layout(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_literal_type&lt;T&gt;</tt></td>
-<td bgcolor="#80FF80"><tt>__is_literal_type(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_convertible&lt;T, U&gt;</tt></td>
-<td bgcolor="#80FF80"><tt>__is_convertible_to(T, U)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_base_of&lt;T, U&gt;</tt></td>
-<td bgcolor="#80FF80"><tt>__is_base_of(T, U)</tt></td>
-</tr>
-
-<tr>
-<td><tt>underlying_type&lt;T&gt;</tt></td>
-<td bgcolor="#80FF80"><tt>__underlying_type(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_polymorphic&lt;T&gt;</tt></td>
-<td><tt>__is_polymorphic(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_empty&lt;T&gt;</tt></td>
-<td><tt>__is_empty(T)</tt></td>
-</tr>
-
-<tr>
-<td><tt>is_abstract&lt;T&gt;</tt></td>
-<td><tt>__is_abstract(T)</tt></td>
-</tr>
-
-</table>
-</blockquote>
-
-</div>
-</body>
-</html>