Reorganize the directory structure under 'stdlib'

The standard library has grown significantly, and we need a new directory structure that clearly reflects the role of the APIs, and allows future growth. See stdlib/{public,internal,private}/README.txt for more information. Swift SVN r25876
apple · Mar 9, 2015 · 350248d · 350248d
1 parent da2e6ad
commit 350248d
Show file tree

Hide file tree

Showing 233 changed files with 120 additions and 63 deletions.
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
@@ -785,7 +785,7 @@ function(_add_swift_library_single target name)
           ${SWIFTLIB_SINGLE_SDK} STREQUAL "OSX")
         # HACK: don't build WatchKit API notes for OS X.
       else()
-        if (NOT IS_DIRECTORY "${SWIFT_SOURCE_DIR}/stdlib/objc/${framework_name}")
+        if (NOT IS_DIRECTORY "${SWIFT_SOURCE_DIR}/stdlib/public/SDK/${framework_name}")
           list(APPEND SWIFTLIB_SINGLE_API_NOTES "${framework_name}")
         endif()
       endif()
@@ -1198,7 +1198,7 @@ function(add_swift_library name)
   if((NOT "${SWIFT_BUILD_STDLIB}") AND
      (NOT "${SWIFTLIB_SWIFT_MODULE_DEPENDS}" STREQUAL ""))
     list(REMOVE_ITEM SWIFTLIB_SWIFT_MODULE_DEPENDS
-        Core SwiftUnstable)
+        Core SwiftPrivate)
   endif()
 
   translate_flags(SWIFTLIB "${SWIFTLIB_options}")
@@ -1565,7 +1565,7 @@ function(add_swift_target_executable name)
 
   if(NOT "${SWIFT_BUILD_STDLIB}")
     list(REMOVE_ITEM SWIFTEXE_TARGET_LINK_FAT_LIBRARIES
-        swiftCore swiftSwiftUnstable)
+        swiftCore swiftSwiftPrivate)
   endif()
 
   foreach(sdk ${SWIFT_SDKS})

diff --git a/include/swift/Runtime/HeapObject.h b/include/swift/Runtime/HeapObject.h
@@ -22,7 +22,7 @@
 #include "swift/Runtime/Config.h"
 
 // Bring in the definition of HeapObject 
-#include "../../../stdlib/shims/HeapObject.h"
+#include "../../../stdlib/public/SwiftShims/HeapObject.h"
 
 namespace swift {
 

diff --git a/stdlib/darwin_extras/CMakeLists.txt b/stdlib/darwin_extras/CMakeLists.txt
diff --git a/stdlib/internal/CMakeLists.txt b/stdlib/internal/CMakeLists.txt
@@ -0,0 +1,4 @@
+if(SWIFT_BUILD_STDLIB)
+  add_subdirectory(SwiftExperimental)
+endif()
+
diff --git a/stdlib/internal/README.txt b/stdlib/internal/README.txt
@@ -0,0 +1,6 @@
+The modules in the 'stdlib/internal' directory provide APIs that are
+under active development and intended to be merged into the appropriate
+libraries under 'stdlib/public' in the near future, after API review is
+complete and when all other tools that accompany these new APIs are ready.
+
+
diff --git a/stdlib/experimental/CMakeLists.txt → ...internal/SwiftExperimental/CMakeLists.txt b/stdlib/experimental/CMakeLists.txt → ...internal/SwiftExperimental/CMakeLists.txt
diff --git a/stdlib/experimental/SwiftExperimental.swift → ...SwiftExperimental/SwiftExperimental.swift b/stdlib/experimental/SwiftExperimental.swift → ...SwiftExperimental/SwiftExperimental.swift
diff --git a/stdlib/private/CMakeLists.txt b/stdlib/private/CMakeLists.txt
@@ -0,0 +1,21 @@
+if(SWIFT_BUILD_STDLIB)
+  add_subdirectory(SwiftPrivate)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  if(SWIFT_BUILD_SDK_OVERLAY)
+    # FIXME: there is nothing Darwin-specific in StdlibUnittest, but to use
+    # POSIX APIs it imports the Darwin module on Apple platforms, so it can't
+    # be built separately from the SDK overlay.
+    add_subdirectory(StdlibUnittest)
+    add_subdirectory(SwiftPrivateDarwinExtras)
+    add_subdirectory(SwiftPrivatePthreadExtras)
+  endif()
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  add_subdirectory(Glibc)
+  add_subdirectory(StdlibUnittest)
+  add_subdirectory(SwiftPrivateDarwinExtras)
+  add_subdirectory(SwiftPrivatePthreadExtras)
+endif()
diff --git a/stdlib/glibc/CMakeLists.txt → stdlib/private/Glibc/CMakeLists.txt b/stdlib/glibc/CMakeLists.txt → stdlib/private/Glibc/CMakeLists.txt
diff --git a/stdlib/glibc/Glibc.swift → stdlib/private/Glibc/Glibc.swift b/stdlib/glibc/Glibc.swift → stdlib/private/Glibc/Glibc.swift
diff --git a/stdlib/glibc/module.map → stdlib/private/Glibc/module.map b/stdlib/glibc/module.map → stdlib/private/Glibc/module.map
diff --git a/stdlib/private/README.txt b/stdlib/private/README.txt
@@ -0,0 +1,11 @@
+The modules in the 'stdlib/private' directory contain APIs that are
+considered private to the Swift project.  Don't use them outside of the
+repositories related to the Swift project.
+
+These APIs are used for building Swift build and test automation tools,
+represent early prototypes of APIs that are not intended to be included
+in the standard library soon, modules to support ports to other platforms,
+and other similar needs that are private to the Swift project and its
+development process.
+
+
diff --git a/stdlib/unittest/CMakeLists.txt → stdlib/private/StdlibUnittest/CMakeLists.txt b/stdlib/unittest/CMakeLists.txt → stdlib/private/StdlibUnittest/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(swift_stdlib_unittest_platform_sources)
 set(swift_stdlib_unittest_module_depends
-  SwiftUnstable SwiftUnstablePthreadExtras SwiftUnstableDarwinExtras)
+  SwiftPrivate SwiftPrivatePthreadExtras SwiftPrivateDarwinExtras)
 set(swift_stdlib_unittest_framework_depends)
 set(swift_stdlib_unittest_private_link_libraries)
 

diff --git a/stdlib/unittest/GetOSVersion.mm → ...ib/private/StdlibUnittest/GetOSVersion.mm b/stdlib/unittest/GetOSVersion.mm → ...ib/private/StdlibUnittest/GetOSVersion.mm
diff --git a/stdlib/unittest/InterceptTraps.cpp → ...private/StdlibUnittest/InterceptTraps.cpp b/stdlib/unittest/InterceptTraps.cpp → ...private/StdlibUnittest/InterceptTraps.cpp
diff --git a/stdlib/unittest/LifetimeTracked.swift → ...vate/StdlibUnittest/LifetimeTracked.swift b/stdlib/unittest/LifetimeTracked.swift → ...vate/StdlibUnittest/LifetimeTracked.swift
diff --git a/stdlib/unittest/OpaqueIdentityFunctions.cpp → ...tdlibUnittest/OpaqueIdentityFunctions.cpp b/stdlib/unittest/OpaqueIdentityFunctions.cpp → ...tdlibUnittest/OpaqueIdentityFunctions.cpp
diff --git a/...ib/unittest/OpaqueIdentityFunctions.swift → ...libUnittest/OpaqueIdentityFunctions.swift b/...ib/unittest/OpaqueIdentityFunctions.swift → ...libUnittest/OpaqueIdentityFunctions.swift
diff --git a/stdlib/unittest/RaceTest.swift → stdlib/private/StdlibUnittest/RaceTest.swift b/stdlib/unittest/RaceTest.swift → stdlib/private/StdlibUnittest/RaceTest.swift
@@ -36,8 +36,8 @@
 ///
 //===----------------------------------------------------------------------===//
 
-import SwiftUnstable
-import SwiftUnstablePthreadExtras
+import SwiftPrivate
+import SwiftPrivatePthreadExtras
 #if os(OSX) || os(iOS)
 import Darwin
 #elseif os(Linux)

diff --git a/stdlib/unittest/Statistics.swift → ...b/private/StdlibUnittest/Statistics.swift b/stdlib/unittest/Statistics.swift → ...b/private/StdlibUnittest/Statistics.swift
diff --git a/stdlib/unittest/StdlibCoreExtras.swift → ...ate/StdlibUnittest/StdlibCoreExtras.swift b/stdlib/unittest/StdlibCoreExtras.swift → ...ate/StdlibUnittest/StdlibCoreExtras.swift
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SwiftUnstable
-import SwiftUnstableDarwinExtras
+import SwiftPrivate
+import SwiftPrivateDarwinExtras
 #if os(OSX) || os(iOS)
 import Darwin
 #elseif os(Linux)

diff --git a/stdlib/unittest/StdlibUnittest.swift.gyb → ...e/StdlibUnittest/StdlibUnittest.swift.gyb b/stdlib/unittest/StdlibUnittest.swift.gyb → ...e/StdlibUnittest/StdlibUnittest.swift.gyb
@@ -10,9 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SwiftUnstable
-import SwiftUnstablePthreadExtras
-import SwiftUnstableDarwinExtras
+import SwiftPrivate
+import SwiftPrivatePthreadExtras
+import SwiftPrivateDarwinExtras
 
 #if os(OSX) || os(iOS)
 import Darwin

diff --git a/stdlib/unittest/TestHelpers.swift → .../private/StdlibUnittest/TestHelpers.swift b/stdlib/unittest/TestHelpers.swift → .../private/StdlibUnittest/TestHelpers.swift
diff --git a/stdlib/unstable/CMakeLists.txt → stdlib/private/SwiftPrivate/CMakeLists.txt b/stdlib/unstable/CMakeLists.txt → stdlib/private/SwiftPrivate/CMakeLists.txt
@@ -1,20 +1,20 @@
-set(swift_unstable_private_link_libraries)
+set(swift_private_private_link_libraries)
 if(SWIFT_HOST_VARIANT STREQUAL "linux")
   # Needed for arc4random
   find_package(BSD REQUIRED)
-  list(APPEND swift_unstable_private_link_libraries
+  list(APPEND swift_private_private_link_libraries
     ${BSD_LIBRARIES})
 endif()
 
-add_swift_library(swiftSwiftUnstable SHARED IS_STDLIB
+add_swift_library(swiftSwiftPrivate SHARED IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
-  SwiftUnstable.swift
+  SwiftPrivate.swift
   IO.swift
   PRNG.swift
   ShardedAtomicCounter.swift
 
   SWIFT_COMPILE_FLAGS -Xfrontend -sil-serialize-all
-  PRIVATE_LINK_LIBRARIES ${swift_unstable_private_link_libraries}
+  PRIVATE_LINK_LIBRARIES ${swift_private_private_link_libraries}
   INSTALL_IN_COMPONENT stdlib-experimental)
 
diff --git a/stdlib/unstable/IO.swift → stdlib/private/SwiftPrivate/IO.swift b/stdlib/unstable/IO.swift → stdlib/private/SwiftPrivate/IO.swift
diff --git a/stdlib/unstable/PRNG.swift → stdlib/private/SwiftPrivate/PRNG.swift b/stdlib/unstable/PRNG.swift → stdlib/private/SwiftPrivate/PRNG.swift
diff --git a/stdlib/unstable/ShardedAtomicCounter.swift → ...e/SwiftPrivate/ShardedAtomicCounter.swift b/stdlib/unstable/ShardedAtomicCounter.swift → ...e/SwiftPrivate/ShardedAtomicCounter.swift
diff --git a/stdlib/unstable/SwiftUnstable.swift → ...b/private/SwiftPrivate/SwiftPrivate.swift b/stdlib/unstable/SwiftUnstable.swift → ...b/private/SwiftPrivate/SwiftPrivate.swift
diff --git a/stdlib/private/SwiftPrivateDarwinExtras/CMakeLists.txt b/stdlib/private/SwiftPrivateDarwinExtras/CMakeLists.txt
@@ -0,0 +1,20 @@
+set(swift_private_darwin_extras_module_depends
+  SwiftPrivate)
+
+if(SWIFT_HOST_VARIANT STREQUAL "macosx")
+  list(APPEND swift_private_darwin_extras_module_depends
+    Darwin)
+elseif(SWIFT_HOST_VARIANT STREQUAL "linux")
+  list(APPEND swift_private_darwin_extras_module_depends
+    Glibc)
+endif()
+
+add_swift_library(swiftSwiftPrivateDarwinExtras SHARED IS_STDLIB
+  # This file should be listed the first.  Module name is inferred from the
+  # filename.
+  SwiftPrivateDarwinExtras.swift
+  Subprocess.swift
+
+  SWIFT_MODULE_DEPENDS ${swift_private_darwin_extras_module_depends}
+  SWIFT_COMPILE_FLAGS -Xfrontend -sil-serialize-all
+  INSTALL_IN_COMPONENT stdlib-experimental)
diff --git a/stdlib/darwin_extras/Subprocess.swift → ...SwiftPrivateDarwinExtras/Subprocess.swift b/stdlib/darwin_extras/Subprocess.swift → ...SwiftPrivateDarwinExtras/Subprocess.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SwiftUnstable
+import SwiftPrivate
 #if os(OSX) || os(iOS)
 import Darwin
 #elseif os(Linux)

diff --git a/...in_extras/SwiftUnstableDarwinExtras.swift → ...rwinExtras/SwiftPrivateDarwinExtras.swift b/...in_extras/SwiftUnstableDarwinExtras.swift → ...rwinExtras/SwiftPrivateDarwinExtras.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SwiftUnstable
+import SwiftPrivate
 #if os(OSX) || os(iOS)
 import Darwin
 #elseif os(Linux)

diff --git a/stdlib/pthread_extras/CMakeLists.txt → .../SwiftPrivatePthreadExtras/CMakeLists.txt b/stdlib/pthread_extras/CMakeLists.txt → .../SwiftPrivatePthreadExtras/CMakeLists.txt
@@ -1,21 +1,21 @@
-set(swift_unstable_pthread_extras_module_depends)
+set(swift_private_pthread_extras_module_depends)
 
 if(SWIFT_HOST_VARIANT STREQUAL "macosx")
-  list(APPEND swift_unstable_pthread_extras_module_depends
+  list(APPEND swift_private_pthread_extras_module_depends
     Darwin)
 elseif(SWIFT_HOST_VARIANT STREQUAL "linux")
-  list(APPEND swift_unstable_pthread_extras_module_depends
+  list(APPEND swift_private_pthread_extras_module_depends
     Glibc)
 endif()
 
-add_swift_library(swiftSwiftUnstablePthreadExtras SHARED IS_STDLIB
+add_swift_library(swiftSwiftPrivatePthreadExtras SHARED IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
-  SwiftUnstablePthreadExtras.swift
+  SwiftPrivatePthreadExtras.swift
   PthreadBarriers.swift
   SwiftBlockToCFunctionThunks.cpp
 
-  SWIFT_MODULE_DEPENDS ${swift_unstable_pthread_extras_module_depends}
+  SWIFT_MODULE_DEPENDS ${swift_private_pthread_extras_module_depends}
   SWIFT_COMPILE_FLAGS -Xfrontend -sil-serialize-all
   INSTALL_IN_COMPONENT stdlib-experimental)
 
diff --git a/stdlib/pthread_extras/PthreadBarriers.swift → ...rivatePthreadExtras/PthreadBarriers.swift b/stdlib/pthread_extras/PthreadBarriers.swift → ...rivatePthreadExtras/PthreadBarriers.swift
diff --git a/...ad_extras/SwiftBlockToCFunctionThunks.cpp → ...eadExtras/SwiftBlockToCFunctionThunks.cpp b/...ad_extras/SwiftBlockToCFunctionThunks.cpp → ...eadExtras/SwiftBlockToCFunctionThunks.cpp
diff --git a/...d_extras/SwiftUnstablePthreadExtras.swift → ...eadExtras/SwiftPrivatePthreadExtras.swift b/...d_extras/SwiftUnstablePthreadExtras.swift → ...eadExtras/SwiftPrivatePthreadExtras.swift
@@ -1,4 +1,4 @@
-//===--- SwiftUnstablePthreadExtras.swift ---------------------------------===//
+//===--- SwiftPrivatePthreadExtras.swift ----------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //

diff --git a/stdlib/public/CMakeLists.txt b/stdlib/public/CMakeLists.txt
@@ -0,0 +1,12 @@
+if(SWIFT_BUILD_STDLIB)
+  add_subdirectory(SwiftShims)
+  add_subdirectory(core)
+  add_subdirectory(runtime)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  if(SWIFT_BUILD_SDK_OVERLAY)
+    add_subdirectory(SDK)
+  endif()
+endif()
+
diff --git a/stdlib/public/README.txt b/stdlib/public/README.txt
@@ -0,0 +1,3 @@
+The modules in the 'stdlib/public' directory are shipped publicly
+as a part of Apple Swift.
+
diff --git a/stdlib/objc/AppKit/AppKit.swift → stdlib/public/SDK/AppKit/AppKit.swift b/stdlib/objc/AppKit/AppKit.swift → stdlib/public/SDK/AppKit/AppKit.swift
diff --git a/stdlib/objc/AppKit/CMakeLists.txt → stdlib/public/SDK/AppKit/CMakeLists.txt b/stdlib/objc/AppKit/CMakeLists.txt → stdlib/public/SDK/AppKit/CMakeLists.txt
diff --git a/...ib/objc/AssetsLibrary/AssetsLibrary.swift → ...lic/SDK/AssetsLibrary/AssetsLibrary.swift b/...ib/objc/AssetsLibrary/AssetsLibrary.swift → ...lic/SDK/AssetsLibrary/AssetsLibrary.swift
diff --git a/stdlib/objc/AssetsLibrary/CMakeLists.txt → ...b/public/SDK/AssetsLibrary/CMakeLists.txt b/stdlib/objc/AssetsLibrary/CMakeLists.txt → ...b/public/SDK/AssetsLibrary/CMakeLists.txt
diff --git a/stdlib/objc/CMakeLists.txt → stdlib/public/SDK/CMakeLists.txt b/stdlib/objc/CMakeLists.txt → stdlib/public/SDK/CMakeLists.txt
diff --git a/stdlib/objc/CoreAudio/CMakeLists.txt → stdlib/public/SDK/CoreAudio/CMakeLists.txt b/stdlib/objc/CoreAudio/CMakeLists.txt → stdlib/public/SDK/CoreAudio/CMakeLists.txt
diff --git a/stdlib/objc/CoreAudio/CoreAudio.swift → stdlib/public/SDK/CoreAudio/CoreAudio.swift b/stdlib/objc/CoreAudio/CoreAudio.swift → stdlib/public/SDK/CoreAudio/CoreAudio.swift
diff --git a/stdlib/objc/CoreGraphics/CGFloat.swift.gyb → ...public/SDK/CoreGraphics/CGFloat.swift.gyb b/stdlib/objc/CoreGraphics/CGFloat.swift.gyb → ...public/SDK/CoreGraphics/CGFloat.swift.gyb
diff --git a/stdlib/objc/CoreGraphics/CMakeLists.txt → ...ib/public/SDK/CoreGraphics/CMakeLists.txt b/stdlib/objc/CoreGraphics/CMakeLists.txt → ...ib/public/SDK/CoreGraphics/CMakeLists.txt
diff --git a/stdlib/objc/CoreGraphics/CoreGraphics.swift → ...ublic/SDK/CoreGraphics/CoreGraphics.swift b/stdlib/objc/CoreGraphics/CoreGraphics.swift → ...ublic/SDK/CoreGraphics/CoreGraphics.swift
diff --git a/...oreGraphics/CoreGraphicsMirrors.swift.gyb → ...oreGraphics/CoreGraphicsMirrors.swift.gyb b/...oreGraphics/CoreGraphicsMirrors.swift.gyb → ...oreGraphics/CoreGraphicsMirrors.swift.gyb
diff --git a/stdlib/objc/CoreImage/CMakeLists.txt → stdlib/public/SDK/CoreImage/CMakeLists.txt b/stdlib/objc/CoreImage/CMakeLists.txt → stdlib/public/SDK/CoreImage/CMakeLists.txt
diff --git a/stdlib/objc/CoreImage/CoreImage.swift → stdlib/public/SDK/CoreImage/CoreImage.swift b/stdlib/objc/CoreImage/CoreImage.swift → stdlib/public/SDK/CoreImage/CoreImage.swift
diff --git a/stdlib/objc/Darwin/CMakeLists.txt → stdlib/public/SDK/Darwin/CMakeLists.txt b/stdlib/objc/Darwin/CMakeLists.txt → stdlib/public/SDK/Darwin/CMakeLists.txt
diff --git a/stdlib/objc/Darwin/Darwin.swift → stdlib/public/SDK/Darwin/Darwin.swift b/stdlib/objc/Darwin/Darwin.swift → stdlib/public/SDK/Darwin/Darwin.swift
diff --git a/stdlib/objc/Darwin/Misc.mm → stdlib/public/SDK/Darwin/Misc.mm b/stdlib/objc/Darwin/Misc.mm → stdlib/public/SDK/Darwin/Misc.mm
diff --git a/stdlib/objc/Darwin/tgmath.swift.gyb → stdlib/public/SDK/Darwin/tgmath.swift.gyb b/stdlib/objc/Darwin/tgmath.swift.gyb → stdlib/public/SDK/Darwin/tgmath.swift.gyb
diff --git a/stdlib/objc/Dispatch/CMakeLists.txt → stdlib/public/SDK/Dispatch/CMakeLists.txt b/stdlib/objc/Dispatch/CMakeLists.txt → stdlib/public/SDK/Dispatch/CMakeLists.txt
diff --git a/stdlib/objc/Dispatch/Dispatch.mm → stdlib/public/SDK/Dispatch/Dispatch.mm b/stdlib/objc/Dispatch/Dispatch.mm → stdlib/public/SDK/Dispatch/Dispatch.mm
diff --git a/stdlib/objc/Dispatch/Dispatch.swift → stdlib/public/SDK/Dispatch/Dispatch.swift b/stdlib/objc/Dispatch/Dispatch.swift → stdlib/public/SDK/Dispatch/Dispatch.swift
diff --git a/stdlib/objc/Foundation/CMakeLists.txt → stdlib/public/SDK/Foundation/CMakeLists.txt b/stdlib/objc/Foundation/CMakeLists.txt → stdlib/public/SDK/Foundation/CMakeLists.txt
diff --git a/stdlib/objc/Foundation/ExtraStringAPIs.swift → ...blic/SDK/Foundation/ExtraStringAPIs.swift b/stdlib/objc/Foundation/ExtraStringAPIs.swift → ...blic/SDK/Foundation/ExtraStringAPIs.swift
diff --git a/stdlib/objc/Foundation/Foundation.swift → ...ib/public/SDK/Foundation/Foundation.swift b/stdlib/objc/Foundation/Foundation.swift → ...ib/public/SDK/Foundation/Foundation.swift
diff --git a/...jc/Foundation/FoundationMirrors.swift.gyb → ...DK/Foundation/FoundationMirrors.swift.gyb b/...jc/Foundation/FoundationMirrors.swift.gyb → ...DK/Foundation/FoundationMirrors.swift.gyb
diff --git a/stdlib/objc/Foundation/Misc.mm → stdlib/public/SDK/Foundation/Misc.mm b/stdlib/objc/Foundation/Misc.mm → stdlib/public/SDK/Foundation/Misc.mm
diff --git a/stdlib/objc/Foundation/NSStringAPI.swift → ...b/public/SDK/Foundation/NSStringAPI.swift b/stdlib/objc/Foundation/NSStringAPI.swift → ...b/public/SDK/Foundation/NSStringAPI.swift
diff --git a/stdlib/objc/Foundation/NSValue.swift → stdlib/public/SDK/Foundation/NSValue.swift b/stdlib/objc/Foundation/NSValue.swift → stdlib/public/SDK/Foundation/NSValue.swift
diff --git a/stdlib/objc/GLKit/CMakeLists.txt → stdlib/public/SDK/GLKit/CMakeLists.txt b/stdlib/objc/GLKit/CMakeLists.txt → stdlib/public/SDK/GLKit/CMakeLists.txt
diff --git a/stdlib/objc/GLKit/GLKit.swift.gyb → stdlib/public/SDK/GLKit/GLKit.swift.gyb b/stdlib/objc/GLKit/GLKit.swift.gyb → stdlib/public/SDK/GLKit/GLKit.swift.gyb
diff --git a/stdlib/objc/ObjectiveC/CMakeLists.txt → stdlib/public/SDK/ObjectiveC/CMakeLists.txt b/stdlib/objc/ObjectiveC/CMakeLists.txt → stdlib/public/SDK/ObjectiveC/CMakeLists.txt
diff --git a/stdlib/objc/ObjectiveC/ObjectiveC.swift → ...ib/public/SDK/ObjectiveC/ObjectiveC.swift b/stdlib/objc/ObjectiveC/ObjectiveC.swift → ...ib/public/SDK/ObjectiveC/ObjectiveC.swift
diff --git a/stdlib/objc/OpenCL/CMakeLists.txt → stdlib/public/SDK/OpenCL/CMakeLists.txt b/stdlib/objc/OpenCL/CMakeLists.txt → stdlib/public/SDK/OpenCL/CMakeLists.txt
diff --git a/stdlib/objc/OpenCL/OpenCL.swift → stdlib/public/SDK/OpenCL/OpenCL.swift b/stdlib/objc/OpenCL/OpenCL.swift → stdlib/public/SDK/OpenCL/OpenCL.swift
diff --git a/stdlib/objc/QuartzCore/CMakeLists.txt → stdlib/public/SDK/QuartzCore/CMakeLists.txt b/stdlib/objc/QuartzCore/CMakeLists.txt → stdlib/public/SDK/QuartzCore/CMakeLists.txt
diff --git a/stdlib/objc/QuartzCore/QuartzCore.swift → ...ib/public/SDK/QuartzCore/QuartzCore.swift b/stdlib/objc/QuartzCore/QuartzCore.swift → ...ib/public/SDK/QuartzCore/QuartzCore.swift
diff --git a/stdlib/objc/Security/CMakeLists.txt → stdlib/public/SDK/Security/CMakeLists.txt b/stdlib/objc/Security/CMakeLists.txt → stdlib/public/SDK/Security/CMakeLists.txt
diff --git a/stdlib/objc/Security/Security.swift → stdlib/public/SDK/Security/Security.swift b/stdlib/objc/Security/Security.swift → stdlib/public/SDK/Security/Security.swift
diff --git a/stdlib/objc/SpriteKit/CMakeLists.txt → stdlib/public/SDK/SpriteKit/CMakeLists.txt b/stdlib/objc/SpriteKit/CMakeLists.txt → stdlib/public/SDK/SpriteKit/CMakeLists.txt
diff --git a/stdlib/objc/SpriteKit/SpriteKit.swift → stdlib/public/SDK/SpriteKit/SpriteKit.swift b/stdlib/objc/SpriteKit/SpriteKit.swift → stdlib/public/SDK/SpriteKit/SpriteKit.swift
diff --git a/...objc/SpriteKit/SpriteKitMirrors.swift.gyb → .../SDK/SpriteKit/SpriteKitMirrors.swift.gyb b/...objc/SpriteKit/SpriteKitMirrors.swift.gyb → .../SDK/SpriteKit/SpriteKitMirrors.swift.gyb
diff --git a/stdlib/objc/UIKit/CMakeLists.txt → stdlib/public/SDK/UIKit/CMakeLists.txt b/stdlib/objc/UIKit/CMakeLists.txt → stdlib/public/SDK/UIKit/CMakeLists.txt
diff --git a/stdlib/objc/UIKit/DesignatedInitializers.mm → ...ublic/SDK/UIKit/DesignatedInitializers.mm b/stdlib/objc/UIKit/DesignatedInitializers.mm → ...ublic/SDK/UIKit/DesignatedInitializers.mm
diff --git a/stdlib/objc/UIKit/UIKit.swift → stdlib/public/SDK/UIKit/UIKit.swift b/stdlib/objc/UIKit/UIKit.swift → stdlib/public/SDK/UIKit/UIKit.swift
diff --git a/stdlib/objc/XCTest/CMakeLists.txt → stdlib/public/SDK/XCTest/CMakeLists.txt b/stdlib/objc/XCTest/CMakeLists.txt → stdlib/public/SDK/XCTest/CMakeLists.txt
diff --git a/stdlib/objc/XCTest/XCTest.swift → stdlib/public/SDK/XCTest/XCTest.swift b/stdlib/objc/XCTest/XCTest.swift → stdlib/public/SDK/XCTest/XCTest.swift
diff --git a/stdlib/objc/XCTest/XCTestCaseAdditions.mm → .../public/SDK/XCTest/XCTestCaseAdditions.mm b/stdlib/objc/XCTest/XCTestCaseAdditions.mm → .../public/SDK/XCTest/XCTestCaseAdditions.mm
diff --git a/stdlib/shims/CMakeLists.txt → stdlib/public/SwiftShims/CMakeLists.txt b/stdlib/shims/CMakeLists.txt → stdlib/public/SwiftShims/CMakeLists.txt
diff --git a/stdlib/shims/CoreFoundationShims.h → ...b/public/SwiftShims/CoreFoundationShims.h b/stdlib/shims/CoreFoundationShims.h → ...b/public/SwiftShims/CoreFoundationShims.h
diff --git a/stdlib/shims/DarwinShims.h → stdlib/public/SwiftShims/DarwinShims.h b/stdlib/shims/DarwinShims.h → stdlib/public/SwiftShims/DarwinShims.h
diff --git a/stdlib/shims/FoundationShims.h → stdlib/public/SwiftShims/FoundationShims.h b/stdlib/shims/FoundationShims.h → stdlib/public/SwiftShims/FoundationShims.h
diff --git a/stdlib/shims/GlobalObjects.h → stdlib/public/SwiftShims/GlobalObjects.h b/stdlib/shims/GlobalObjects.h → stdlib/public/SwiftShims/GlobalObjects.h
diff --git a/stdlib/shims/HeapObject.h → stdlib/public/SwiftShims/HeapObject.h b/stdlib/shims/HeapObject.h → stdlib/public/SwiftShims/HeapObject.h
diff --git a/stdlib/shims/RefCount.h → stdlib/public/SwiftShims/RefCount.h b/stdlib/shims/RefCount.h → stdlib/public/SwiftShims/RefCount.h
diff --git a/stdlib/shims/RuntimeShims.h → stdlib/public/SwiftShims/RuntimeShims.h b/stdlib/shims/RuntimeShims.h → stdlib/public/SwiftShims/RuntimeShims.h
diff --git a/stdlib/shims/RuntimeStubs.h → stdlib/public/SwiftShims/RuntimeStubs.h b/stdlib/shims/RuntimeStubs.h → stdlib/public/SwiftShims/RuntimeStubs.h
diff --git a/stdlib/shims/SwiftStddef.h → stdlib/public/SwiftShims/SwiftStddef.h b/stdlib/shims/SwiftStddef.h → stdlib/public/SwiftShims/SwiftStddef.h
diff --git a/stdlib/shims/SwiftStdint.h → stdlib/public/SwiftShims/SwiftStdint.h b/stdlib/shims/SwiftStdint.h → stdlib/public/SwiftShims/SwiftStdint.h
diff --git a/stdlib/shims/UnicodeShims.h → stdlib/public/SwiftShims/UnicodeShims.h b/stdlib/shims/UnicodeShims.h → stdlib/public/SwiftShims/UnicodeShims.h
diff --git a/stdlib/shims/module.map → stdlib/public/SwiftShims/module.map b/stdlib/shims/module.map → stdlib/public/SwiftShims/module.map
diff --git a/stdlib/common/MirrorBoilerplate.gyb → stdlib/public/common/MirrorBoilerplate.gyb b/stdlib/common/MirrorBoilerplate.gyb → stdlib/public/common/MirrorBoilerplate.gyb
diff --git a/stdlib/common/MirrorCommon.py → stdlib/public/common/MirrorCommon.py b/stdlib/common/MirrorCommon.py → stdlib/public/common/MirrorCommon.py
diff --git a/stdlib/common/MirrorConformance.gyb → stdlib/public/common/MirrorConformance.gyb b/stdlib/common/MirrorConformance.gyb → stdlib/public/common/MirrorConformance.gyb
diff --git a/stdlib/common/MirrorDecl.gyb → stdlib/public/common/MirrorDecl.gyb b/stdlib/common/MirrorDecl.gyb → stdlib/public/common/MirrorDecl.gyb
diff --git a/stdlib/core/Algorithm.swift → stdlib/public/core/Algorithm.swift b/stdlib/core/Algorithm.swift → stdlib/public/core/Algorithm.swift
diff --git a/stdlib/core/ArrayBody.swift → stdlib/public/core/ArrayBody.swift b/stdlib/core/ArrayBody.swift → stdlib/public/core/ArrayBody.swift
diff --git a/stdlib/core/ArrayBuffer.swift → stdlib/public/core/ArrayBuffer.swift b/stdlib/core/ArrayBuffer.swift → stdlib/public/core/ArrayBuffer.swift
diff --git a/stdlib/core/ArrayBufferType.swift → stdlib/public/core/ArrayBufferType.swift b/stdlib/core/ArrayBufferType.swift → stdlib/public/core/ArrayBufferType.swift
diff --git a/stdlib/core/ArrayCast.swift → stdlib/public/core/ArrayCast.swift b/stdlib/core/ArrayCast.swift → stdlib/public/core/ArrayCast.swift
diff --git a/stdlib/core/ArrayType.swift → stdlib/public/core/ArrayType.swift b/stdlib/core/ArrayType.swift → stdlib/public/core/ArrayType.swift
diff --git a/stdlib/core/Arrays.swift.gyb → stdlib/public/core/Arrays.swift.gyb b/stdlib/core/Arrays.swift.gyb → stdlib/public/core/Arrays.swift.gyb
diff --git a/stdlib/core/Assert.swift → stdlib/public/core/Assert.swift b/stdlib/core/Assert.swift → stdlib/public/core/Assert.swift
diff --git a/stdlib/core/AssertCommon.swift → stdlib/public/core/AssertCommon.swift b/stdlib/core/AssertCommon.swift → stdlib/public/core/AssertCommon.swift
diff --git a/stdlib/core/Availability.swift → stdlib/public/core/Availability.swift b/stdlib/core/Availability.swift → stdlib/public/core/Availability.swift
diff --git a/stdlib/core/Bit.swift → stdlib/public/core/Bit.swift b/stdlib/core/Bit.swift → stdlib/public/core/Bit.swift
diff --git a/stdlib/core/Bool.swift → stdlib/public/core/Bool.swift b/stdlib/core/Bool.swift → stdlib/public/core/Bool.swift
diff --git a/stdlib/core/BooleanType.swift → stdlib/public/core/BooleanType.swift b/stdlib/core/BooleanType.swift → stdlib/public/core/BooleanType.swift
diff --git a/stdlib/core/BridgeObjectiveC.swift → stdlib/public/core/BridgeObjectiveC.swift b/stdlib/core/BridgeObjectiveC.swift → stdlib/public/core/BridgeObjectiveC.swift
diff --git a/stdlib/core/BridgeStorage.swift → stdlib/public/core/BridgeStorage.swift b/stdlib/core/BridgeStorage.swift → stdlib/public/core/BridgeStorage.swift
diff --git a/stdlib/core/Builtin.swift → stdlib/public/core/Builtin.swift b/stdlib/core/Builtin.swift → stdlib/public/core/Builtin.swift
diff --git a/stdlib/core/BuiltinMath.swift.gyb → stdlib/public/core/BuiltinMath.swift.gyb b/stdlib/core/BuiltinMath.swift.gyb → stdlib/public/core/BuiltinMath.swift.gyb
diff --git a/stdlib/core/CMakeLists.txt → stdlib/public/core/CMakeLists.txt b/stdlib/core/CMakeLists.txt → stdlib/public/core/CMakeLists.txt
diff --git a/stdlib/core/CString.swift → stdlib/public/core/CString.swift b/stdlib/core/CString.swift → stdlib/public/core/CString.swift
diff --git a/stdlib/core/CTypes.swift → stdlib/public/core/CTypes.swift b/stdlib/core/CTypes.swift → stdlib/public/core/CTypes.swift
diff --git a/stdlib/core/Character.swift → stdlib/public/core/Character.swift b/stdlib/core/Character.swift → stdlib/public/core/Character.swift
diff --git a/stdlib/core/CocoaArray.swift → stdlib/public/core/CocoaArray.swift b/stdlib/core/CocoaArray.swift → stdlib/public/core/CocoaArray.swift
diff --git a/stdlib/core/Collection.swift → stdlib/public/core/Collection.swift b/stdlib/core/Collection.swift → stdlib/public/core/Collection.swift
diff --git a/stdlib/core/CollectionMirrors.swift.gyb → ...b/public/core/CollectionMirrors.swift.gyb b/stdlib/core/CollectionMirrors.swift.gyb → ...b/public/core/CollectionMirrors.swift.gyb
diff --git a/stdlib/core/CollectionOfOne.swift → stdlib/public/core/CollectionOfOne.swift b/stdlib/core/CollectionOfOne.swift → stdlib/public/core/CollectionOfOne.swift
diff --git a/stdlib/core/CompilerProtocols.swift → stdlib/public/core/CompilerProtocols.swift b/stdlib/core/CompilerProtocols.swift → stdlib/public/core/CompilerProtocols.swift
diff --git a/stdlib/core/Concatenate.swift.gyb → stdlib/public/core/Concatenate.swift.gyb b/stdlib/core/Concatenate.swift.gyb → stdlib/public/core/Concatenate.swift.gyb
diff --git a/stdlib/core/ContiguousArrayBuffer.swift → ...b/public/core/ContiguousArrayBuffer.swift b/stdlib/core/ContiguousArrayBuffer.swift → ...b/public/core/ContiguousArrayBuffer.swift
diff --git a/stdlib/core/EmptyCollection.swift → stdlib/public/core/EmptyCollection.swift b/stdlib/core/EmptyCollection.swift → stdlib/public/core/EmptyCollection.swift
diff --git a/stdlib/core/Existential.swift → stdlib/public/core/Existential.swift b/stdlib/core/Existential.swift → stdlib/public/core/Existential.swift
diff --git a/stdlib/core/Filter.swift.gyb → stdlib/public/core/Filter.swift.gyb b/stdlib/core/Filter.swift.gyb → stdlib/public/core/Filter.swift.gyb
diff --git a/stdlib/core/FixedPoint.swift.gyb → stdlib/public/core/FixedPoint.swift.gyb b/stdlib/core/FixedPoint.swift.gyb → stdlib/public/core/FixedPoint.swift.gyb
diff --git a/stdlib/core/FloatingPoint.swift.gyb → stdlib/public/core/FloatingPoint.swift.gyb b/stdlib/core/FloatingPoint.swift.gyb → stdlib/public/core/FloatingPoint.swift.gyb
diff --git a/...ib/core/FloatingPointOperations.swift.gyb → ...ic/core/FloatingPointOperations.swift.gyb b/...ib/core/FloatingPointOperations.swift.gyb → ...ic/core/FloatingPointOperations.swift.gyb
diff --git a/stdlib/core/HashedCollections.swift.gyb → ...b/public/core/HashedCollections.swift.gyb b/stdlib/core/HashedCollections.swift.gyb → ...b/public/core/HashedCollections.swift.gyb
diff --git a/stdlib/core/Hashing.swift → stdlib/public/core/Hashing.swift b/stdlib/core/Hashing.swift → stdlib/public/core/Hashing.swift
diff --git a/stdlib/core/HeapBuffer.swift → stdlib/public/core/HeapBuffer.swift b/stdlib/core/HeapBuffer.swift → stdlib/public/core/HeapBuffer.swift
diff --git a/...ib/core/ImplicitlyUnwrappedOptional.swift → ...ic/core/ImplicitlyUnwrappedOptional.swift b/...ib/core/ImplicitlyUnwrappedOptional.swift → ...ic/core/ImplicitlyUnwrappedOptional.swift
diff --git a/stdlib/core/Index.swift → stdlib/public/core/Index.swift b/stdlib/core/Index.swift → stdlib/public/core/Index.swift
diff --git a/stdlib/core/InputStream.swift → stdlib/public/core/InputStream.swift b/stdlib/core/InputStream.swift → stdlib/public/core/InputStream.swift
diff --git a/stdlib/core/IntegerArithmetic.swift.gyb → ...b/public/core/IntegerArithmetic.swift.gyb b/stdlib/core/IntegerArithmetic.swift.gyb → ...b/public/core/IntegerArithmetic.swift.gyb
diff --git a/stdlib/core/Interval.swift.gyb → stdlib/public/core/Interval.swift.gyb b/stdlib/core/Interval.swift.gyb → stdlib/public/core/Interval.swift.gyb
diff --git a/stdlib/core/Join.swift → stdlib/public/core/Join.swift b/stdlib/core/Join.swift → stdlib/public/core/Join.swift
diff --git a/stdlib/core/LazyCollection.swift.gyb → stdlib/public/core/LazyCollection.swift.gyb b/stdlib/core/LazyCollection.swift.gyb → stdlib/public/core/LazyCollection.swift.gyb
diff --git a/stdlib/core/LazySequence.swift → stdlib/public/core/LazySequence.swift b/stdlib/core/LazySequence.swift → stdlib/public/core/LazySequence.swift
diff --git a/stdlib/core/LifetimeManager.swift → stdlib/public/core/LifetimeManager.swift b/stdlib/core/LifetimeManager.swift → stdlib/public/core/LifetimeManager.swift
diff --git a/stdlib/core/ManagedBuffer.swift → stdlib/public/core/ManagedBuffer.swift b/stdlib/core/ManagedBuffer.swift → stdlib/public/core/ManagedBuffer.swift
diff --git a/stdlib/core/Map.swift.gyb → stdlib/public/core/Map.swift.gyb b/stdlib/core/Map.swift.gyb → stdlib/public/core/Map.swift.gyb
diff --git a/stdlib/core/Mirrors.swift.gyb → stdlib/public/core/Mirrors.swift.gyb b/stdlib/core/Mirrors.swift.gyb → stdlib/public/core/Mirrors.swift.gyb
diff --git a/stdlib/core/Misc.swift → stdlib/public/core/Misc.swift b/stdlib/core/Misc.swift → stdlib/public/core/Misc.swift
diff --git a/stdlib/core/ObjCMirrors.swift → stdlib/public/core/ObjCMirrors.swift b/stdlib/core/ObjCMirrors.swift → stdlib/public/core/ObjCMirrors.swift
diff --git a/stdlib/core/Optional.swift → stdlib/public/core/Optional.swift b/stdlib/core/Optional.swift → stdlib/public/core/Optional.swift
diff --git a/stdlib/core/OutputStream.swift → stdlib/public/core/OutputStream.swift b/stdlib/core/OutputStream.swift → stdlib/public/core/OutputStream.swift
diff --git a/stdlib/core/Pointer.swift → stdlib/public/core/Pointer.swift b/stdlib/core/Pointer.swift → stdlib/public/core/Pointer.swift
diff --git a/stdlib/core/Policy.swift → stdlib/public/core/Policy.swift b/stdlib/core/Policy.swift → stdlib/public/core/Policy.swift
diff --git a/stdlib/core/Process.swift → stdlib/public/core/Process.swift b/stdlib/core/Process.swift → stdlib/public/core/Process.swift
diff --git a/stdlib/core/REPL.swift → stdlib/public/core/REPL.swift b/stdlib/core/REPL.swift → stdlib/public/core/REPL.swift
diff --git a/stdlib/core/Range.swift → stdlib/public/core/Range.swift b/stdlib/core/Range.swift → stdlib/public/core/Range.swift
diff --git a/stdlib/core/RangeMirrors.swift.gyb → stdlib/public/core/RangeMirrors.swift.gyb b/stdlib/core/RangeMirrors.swift.gyb → stdlib/public/core/RangeMirrors.swift.gyb
diff --git a/...core/RangeReplaceableCollectionType.swift → ...core/RangeReplaceableCollectionType.swift b/...core/RangeReplaceableCollectionType.swift → ...core/RangeReplaceableCollectionType.swift
diff --git a/stdlib/core/Reflection.swift → stdlib/public/core/Reflection.swift b/stdlib/core/Reflection.swift → stdlib/public/core/Reflection.swift
diff --git a/stdlib/core/Repeat.swift → stdlib/public/core/Repeat.swift b/stdlib/core/Repeat.swift → stdlib/public/core/Repeat.swift
diff --git a/stdlib/core/Reverse.swift.gyb → stdlib/public/core/Reverse.swift.gyb b/stdlib/core/Reverse.swift.gyb → stdlib/public/core/Reverse.swift.gyb
diff --git a/stdlib/core/Runtime.swift.gyb → stdlib/public/core/Runtime.swift.gyb b/stdlib/core/Runtime.swift.gyb → stdlib/public/core/Runtime.swift.gyb
diff --git a/stdlib/core/ShadowProtocols.swift → stdlib/public/core/ShadowProtocols.swift b/stdlib/core/ShadowProtocols.swift → stdlib/public/core/ShadowProtocols.swift
diff --git a/stdlib/core/Shims.swift → stdlib/public/core/Shims.swift b/stdlib/core/Shims.swift → stdlib/public/core/Shims.swift
diff --git a/stdlib/core/SliceBuffer.swift → stdlib/public/core/SliceBuffer.swift b/stdlib/core/SliceBuffer.swift → stdlib/public/core/SliceBuffer.swift
diff --git a/stdlib/core/Sort.swift.gyb → stdlib/public/core/Sort.swift.gyb b/stdlib/core/Sort.swift.gyb → stdlib/public/core/Sort.swift.gyb
diff --git a/stdlib/core/StaticString.swift → stdlib/public/core/StaticString.swift b/stdlib/core/StaticString.swift → stdlib/public/core/StaticString.swift
diff --git a/stdlib/core/Stride.swift → stdlib/public/core/Stride.swift b/stdlib/core/Stride.swift → stdlib/public/core/Stride.swift
diff --git a/stdlib/core/StrideMirrors.swift.gyb → stdlib/public/core/StrideMirrors.swift.gyb b/stdlib/core/StrideMirrors.swift.gyb → stdlib/public/core/StrideMirrors.swift.gyb
diff --git a/stdlib/core/String.swift → stdlib/public/core/String.swift b/stdlib/core/String.swift → stdlib/public/core/String.swift
diff --git a/stdlib/core/StringBridge.swift → stdlib/public/core/StringBridge.swift b/stdlib/core/StringBridge.swift → stdlib/public/core/StringBridge.swift
diff --git a/stdlib/core/StringBuffer.swift → stdlib/public/core/StringBuffer.swift b/stdlib/core/StringBuffer.swift → stdlib/public/core/StringBuffer.swift
diff --git a/stdlib/core/StringCore.swift → stdlib/public/core/StringCore.swift b/stdlib/core/StringCore.swift → stdlib/public/core/StringCore.swift
diff --git a/stdlib/core/StringInterpolation.swift.gyb → ...public/core/StringInterpolation.swift.gyb b/stdlib/core/StringInterpolation.swift.gyb → ...public/core/StringInterpolation.swift.gyb
diff --git a/stdlib/core/StringLegacy.swift → stdlib/public/core/StringLegacy.swift b/stdlib/core/StringLegacy.swift → stdlib/public/core/StringLegacy.swift
diff --git a/stdlib/core/StringUTF16.swift → stdlib/public/core/StringUTF16.swift b/stdlib/core/StringUTF16.swift → stdlib/public/core/StringUTF16.swift
diff --git a/stdlib/core/StringUTF8.swift → stdlib/public/core/StringUTF8.swift b/stdlib/core/StringUTF8.swift → stdlib/public/core/StringUTF8.swift
diff --git a/stdlib/core/StringUTFViewsMirrors.swift.gyb → ...blic/core/StringUTFViewsMirrors.swift.gyb b/stdlib/core/StringUTFViewsMirrors.swift.gyb → ...blic/core/StringUTFViewsMirrors.swift.gyb
diff --git a/stdlib/core/StringUnicodeScalarView.swift → ...public/core/StringUnicodeScalarView.swift b/stdlib/core/StringUnicodeScalarView.swift → ...public/core/StringUnicodeScalarView.swift
diff --git a/stdlib/core/SwiftNativeNSArray.swift → stdlib/public/core/SwiftNativeNSArray.swift b/stdlib/core/SwiftNativeNSArray.swift → stdlib/public/core/SwiftNativeNSArray.swift
diff --git a/stdlib/core/Unicode.swift → stdlib/public/core/Unicode.swift b/stdlib/core/Unicode.swift → stdlib/public/core/Unicode.swift
diff --git a/stdlib/core/UnicodeScalar.swift → stdlib/public/core/UnicodeScalar.swift b/stdlib/core/UnicodeScalar.swift → stdlib/public/core/UnicodeScalar.swift
diff --git a/stdlib/core/UnicodeTrie.swift.gyb → stdlib/public/core/UnicodeTrie.swift.gyb b/stdlib/core/UnicodeTrie.swift.gyb → stdlib/public/core/UnicodeTrie.swift.gyb
diff --git a/stdlib/core/UnitTestArrayBuffer.swift → stdlib/public/core/UnitTestArrayBuffer.swift b/stdlib/core/UnitTestArrayBuffer.swift → stdlib/public/core/UnitTestArrayBuffer.swift
diff --git a/stdlib/core/Unmanaged.swift → stdlib/public/core/Unmanaged.swift b/stdlib/core/Unmanaged.swift → stdlib/public/core/Unmanaged.swift
diff --git a/stdlib/core/UnsafeBufferPointer.swift.gyb → ...public/core/UnsafeBufferPointer.swift.gyb b/stdlib/core/UnsafeBufferPointer.swift.gyb → ...public/core/UnsafeBufferPointer.swift.gyb
diff --git a/stdlib/core/UnsafePointer.swift.gyb → stdlib/public/core/UnsafePointer.swift.gyb b/stdlib/core/UnsafePointer.swift.gyb → stdlib/public/core/UnsafePointer.swift.gyb
diff --git a/stdlib/core/VarArgs.swift → stdlib/public/core/VarArgs.swift b/stdlib/core/VarArgs.swift → stdlib/public/core/VarArgs.swift
diff --git a/stdlib/core/Zip.swift → stdlib/public/core/Zip.swift b/stdlib/core/Zip.swift → stdlib/public/core/Zip.swift
diff --git a/stdlib/runtime/Availability.mm → stdlib/public/runtime/Availability.mm b/stdlib/runtime/Availability.mm → stdlib/public/runtime/Availability.mm
diff --git a/stdlib/runtime/CMakeLists.txt → stdlib/public/runtime/CMakeLists.txt b/stdlib/runtime/CMakeLists.txt → stdlib/public/runtime/CMakeLists.txt
diff --git a/stdlib/runtime/Casting.cpp → stdlib/public/runtime/Casting.cpp b/stdlib/runtime/Casting.cpp → stdlib/public/runtime/Casting.cpp
@@ -26,7 +26,7 @@
 #include "Debug.h"
 #include "ExistentialMetadataImpl.h"
 #include "Private.h"
-#include "../shims/RuntimeShims.h"
+#include "../SwiftShims/RuntimeShims.h"
 #include "stddef.h"
 
 #if defined(__APPLE__) && defined(__MACH__)

diff --git a/stdlib/runtime/Debug.h → stdlib/public/runtime/Debug.h b/stdlib/runtime/Debug.h → stdlib/public/runtime/Debug.h
diff --git a/stdlib/public/runtime/Demangle.cpp b/stdlib/public/runtime/Demangle.cpp
@@ -0,0 +1,2 @@
+#include "../../../lib/Basic/Demangle.cpp"
+#include "../../../lib/Basic/Punycode.cpp"
diff --git a/stdlib/runtime/Enum.cpp → stdlib/public/runtime/Enum.cpp b/stdlib/runtime/Enum.cpp → stdlib/public/runtime/Enum.cpp
diff --git a/stdlib/runtime/Errors.cpp → stdlib/public/runtime/Errors.cpp b/stdlib/runtime/Errors.cpp → stdlib/public/runtime/Errors.cpp
diff --git a/stdlib/runtime/ExistentialMetadataImpl.h → .../public/runtime/ExistentialMetadataImpl.h b/stdlib/runtime/ExistentialMetadataImpl.h → .../public/runtime/ExistentialMetadataImpl.h
diff --git a/stdlib/runtime/GlobalObjects.cpp → stdlib/public/runtime/GlobalObjects.cpp b/stdlib/runtime/GlobalObjects.cpp → stdlib/public/runtime/GlobalObjects.cpp
@@ -15,7 +15,7 @@
 //  defined here.
 //
 //===----------------------------------------------------------------------===//
-#include "../shims/GlobalObjects.h"
+#include "../SwiftShims/GlobalObjects.h"
 #include "swift/Runtime/Metadata.h"
 
 namespace swift {

diff --git a/stdlib/runtime/Heap.cpp → stdlib/public/runtime/Heap.cpp b/stdlib/runtime/Heap.cpp → stdlib/public/runtime/Heap.cpp
diff --git a/stdlib/runtime/HeapObject.cpp → stdlib/public/runtime/HeapObject.cpp b/stdlib/runtime/HeapObject.cpp → stdlib/public/runtime/HeapObject.cpp
@@ -28,7 +28,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <unistd.h>
-#include "../shims/RuntimeShims.h"
+#include "../SwiftShims/RuntimeShims.h"
 #if SWIFT_OBJC_INTEROP
 # include <objc/objc-runtime.h>
 #endif

diff --git a/stdlib/runtime/KnownMetadata.cpp → stdlib/public/runtime/KnownMetadata.cpp b/stdlib/runtime/KnownMetadata.cpp → stdlib/public/runtime/KnownMetadata.cpp
diff --git a/stdlib/runtime/Lazy.h → stdlib/public/runtime/Lazy.h b/stdlib/runtime/Lazy.h → stdlib/public/runtime/Lazy.h
diff --git a/stdlib/runtime/Leaks.h → stdlib/public/runtime/Leaks.h b/stdlib/runtime/Leaks.h → stdlib/public/runtime/Leaks.h
diff --git a/stdlib/runtime/Leaks.mm → stdlib/public/runtime/Leaks.mm b/stdlib/runtime/Leaks.mm → stdlib/public/runtime/Leaks.mm
diff --git a/stdlib/runtime/Metadata.cpp → stdlib/public/runtime/Metadata.cpp b/stdlib/runtime/Metadata.cpp → stdlib/public/runtime/Metadata.cpp
diff --git a/stdlib/runtime/MetadataCache.h → stdlib/public/runtime/MetadataCache.h b/stdlib/runtime/MetadataCache.h → stdlib/public/runtime/MetadataCache.h
diff --git a/stdlib/runtime/MetadataImpl.h → stdlib/public/runtime/MetadataImpl.h b/stdlib/runtime/MetadataImpl.h → stdlib/public/runtime/MetadataImpl.h
diff --git a/stdlib/runtime/Once.cpp → stdlib/public/runtime/Once.cpp b/stdlib/runtime/Once.cpp → stdlib/public/runtime/Once.cpp
diff --git a/stdlib/runtime/Private.h → stdlib/public/runtime/Private.h b/stdlib/runtime/Private.h → stdlib/public/runtime/Private.h
diff --git a/stdlib/runtime/Reflection.cpp → stdlib/public/runtime/Reflection.cpp b/stdlib/runtime/Reflection.cpp → stdlib/public/runtime/Reflection.cpp
diff --git a/stdlib/runtime/Reflection.mm → stdlib/public/runtime/Reflection.mm b/stdlib/runtime/Reflection.mm → stdlib/public/runtime/Reflection.mm
diff --git a/stdlib/runtime/ShimsChecker.cpp → stdlib/public/runtime/ShimsChecker.cpp b/stdlib/runtime/ShimsChecker.cpp → stdlib/public/runtime/ShimsChecker.cpp
@@ -16,7 +16,7 @@
 
 #include <type_traits>
 #include <unistd.h>
-#include "../shims/DarwinShims.h"
+#include "../SwiftShims/DarwinShims.h"
 
 static_assert(std::is_same<ssize_t, __swift_ssize_t>::value,
               "__swift_ssize_t is wrong");

diff --git a/stdlib/runtime/Stubs.cpp → stdlib/public/runtime/Stubs.cpp b/stdlib/runtime/Stubs.cpp → stdlib/public/runtime/Stubs.cpp
diff --git a/stdlib/runtime/SwiftNativeNSXXXBase.mm.gyb → ...ublic/runtime/SwiftNativeNSXXXBase.mm.gyb b/stdlib/runtime/SwiftNativeNSXXXBase.mm.gyb → ...ublic/runtime/SwiftNativeNSXXXBase.mm.gyb
diff --git a/stdlib/runtime/SwiftObject.cpp → stdlib/public/runtime/SwiftObject.cpp b/stdlib/runtime/SwiftObject.cpp → stdlib/public/runtime/SwiftObject.cpp
diff --git a/stdlib/runtime/SwiftObject.mm → stdlib/public/runtime/SwiftObject.mm b/stdlib/runtime/SwiftObject.mm → stdlib/public/runtime/SwiftObject.mm
@@ -29,7 +29,7 @@
 #include "swift/Runtime/HeapObject.h"
 #include "swift/Runtime/Metadata.h"
 #include "swift/Runtime/ObjCBridge.h"
-#include "../shims/RuntimeShims.h"
+#include "../SwiftShims/RuntimeShims.h"
 #include "Private.h"
 #include "Debug.h"
 #include <dlfcn.h>

diff --git a/stdlib/runtime/SwiftRuntimeDTraceProbes.d → ...public/runtime/SwiftRuntimeDTraceProbes.d b/stdlib/runtime/SwiftRuntimeDTraceProbes.d → ...public/runtime/SwiftRuntimeDTraceProbes.d
diff --git a/...e/UnicodeExtendedGraphemeClusters.cpp.gyb → ...e/UnicodeExtendedGraphemeClusters.cpp.gyb b/...e/UnicodeExtendedGraphemeClusters.cpp.gyb → ...e/UnicodeExtendedGraphemeClusters.cpp.gyb
diff --git a/stdlib/runtime/UnicodeNormalization.cpp → ...b/public/runtime/UnicodeNormalization.cpp b/stdlib/runtime/UnicodeNormalization.cpp → ...b/public/runtime/UnicodeNormalization.cpp
diff --git a/stdlib/runtime/swift.ld → stdlib/public/runtime/swift.ld b/stdlib/runtime/swift.ld → stdlib/public/runtime/swift.ld
diff --git a/stdlib/runtime/Demangle.cpp b/stdlib/runtime/Demangle.cpp
diff --git a/test/1_stdlib/Algorithm.swift b/test/1_stdlib/Algorithm.swift
@@ -1,7 +1,7 @@
 // RUN: %target-run-simple-swift
 
 import StdlibUnittest
-import SwiftUnstable
+import SwiftPrivate
 
 var Algorithm = TestSuite("Algorithm")
 

diff --git a/test/1_stdlib/Character.swift b/test/1_stdlib/Character.swift
@@ -4,7 +4,7 @@
 
 import StdlibUnittest
 import Swift
-import SwiftUnstable
+import SwiftPrivate
 
 //===---
 // Utilities.

diff --git a/validation-test/stdlib/AtomicInt.swift b/validation-test/stdlib/AtomicInt.swift
@@ -4,7 +4,7 @@
 // RUN: %target-build-swift -module-name a %s -o %t.out -O
 // RUN: %target-run %t.out
 
-import SwiftUnstable
+import SwiftPrivate
 import StdlibUnittest
 
 final class HeapBool {

diff --git a/validation-test/stdlib/Hashing.swift b/validation-test/stdlib/Hashing.swift
@@ -1,7 +1,7 @@
 // RUN: %target-run-stdlib-swift
 
 import Swift
-import SwiftUnstable
+import SwiftPrivate
 import StdlibUnittest
 
 var HashingTestSuite = TestSuite("Hashing")

diff --git a/validation-test/stdlib/HashingAvalanche.swift b/validation-test/stdlib/HashingAvalanche.swift
@@ -1,7 +1,7 @@
 // RUN: %target-build-swift -Xfrontend -disable-access-control -module-name a %s -o %t.out -O
 // RUN: %target-run %t.out
 
-import SwiftUnstable
+import SwiftPrivate
 import StdlibUnittest
 
 var HashingTestSuite = TestSuite("Hashing")

diff --git a/validation-test/stdlib/StdlibUnittest.swift b/validation-test/stdlib/StdlibUnittest.swift
@@ -1,6 +1,6 @@
 // RUN: %target-run-simple-swift | FileCheck %s
 
-import SwiftUnstable
+import SwiftPrivate
 import StdlibUnittest
 
 _setOverrideOSVersion(.OSX(major: 10, minor: 9, bugFix: 3))

diff --git a/validation-test/stdlib/StringSlicesConcurrentAppend.swift b/validation-test/stdlib/StringSlicesConcurrentAppend.swift
@@ -1,7 +1,7 @@
 // RUN: %target-run-simple-swift
 
 import StdlibUnittest
-import SwiftUnstablePthreadExtras
+import SwiftPrivatePthreadExtras
 #if os(OSX) || os(iOS)
 import Darwin
 #elseif os(Linux)

diff --git a/validation-test/stdlib/Unicode.swift b/validation-test/stdlib/Unicode.swift
@@ -3,7 +3,7 @@
 // FIXME: rdar://problem/19648117 Needs splitting objc parts out
 // XFAIL: linux
 
-import SwiftUnstable
+import SwiftPrivate
 import StdlibUnittest
 import Foundation
 

diff --git a/validation-test/stdlib/UnicodeTrie.swift.gyb b/validation-test/stdlib/UnicodeTrie.swift.gyb
@@ -26,7 +26,7 @@ grapheme_cluster_break_property_table = \
 
 }%
 
-import SwiftUnstable
+import SwiftPrivate
 import StdlibUnittest
 import Darwin
 import Foundation