diff --git a/cmake/wrap_elf.cmake b/cmake/wrap_elf.cmake
index 09db8bd4a..d584b1907 100644
--- a/cmake/wrap_elf.cmake
+++ b/cmake/wrap_elf.cmake
@@ -14,7 +14,7 @@ function(wrap_elf name elfname)
 	)
 
 	set(DYLIB_INSTALL_NAME "/usr/lib/native/lib${name}.dylib")
-	include_directories(${CMAKE_SOURCE_DIR}/src/dyld)
+	include_directories(${CMAKE_SOURCE_DIR}/src/startup)
 	add_darling_library(${name} SHARED ${CMAKE_CURRENT_BINARY_DIR}/${name}.c)
 	target_link_libraries(${name} PRIVATE system)
 	make_fat(${name})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1b16cb083..981413012 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,7 +41,7 @@ add_subdirectory(external/cctools-port/cctools/misc)
 #add_subdirectory(util)
 #add_subdirectory(libmach-o)
 #add_subdirectory(libdyld)
-add_subdirectory(dyld)
+add_subdirectory(startup)
 
 set(CMAKE_AR "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/ar/x86_64-apple-darwin11-ar")
 set(CMAKE_RANLIB "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ranlib")
@@ -108,7 +108,7 @@ add_subdirectory(libresolv)
 add_subdirectory(libstdcxx)
 add_subdirectory(libffi)
 add_subdirectory(xtrace)
-add_subdirectory(dyld-apple)
+add_subdirectory(dyld)
 add_subdirectory(external/objc4/runtime)
 add_subdirectory(external/syslog/libsystem_asl.tproj)
 add_subdirectory(external/libdispatch)
diff --git a/src/dyld-apple/CMakeLists.txt b/src/dyld-apple/CMakeLists.txt
deleted file mode 100644
index 5d671f414..000000000
--- a/src/dyld-apple/CMakeLists.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-project(dyld-apple)
-
-cmake_minimum_required(VERSION 2.4.0)
-
-if(COMMAND cmake_policy)
-    cmake_policy(SET CMP0003 NEW)
-endif(COMMAND cmake_policy)
-
-include (darling_exe)
-
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc -std=c++11 -include ${CMAKE_SOURCE_DIR}/src/duct/include/CrashReporterClient.h")
-set(CMAKE_SHARED_LINKER_FLAGS_SAVED "${CMAKE_SHARED_LINKER_FLAGS}")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,-bind_at_load -Wl,-flat_namespace -Wl,-undefined,suppress")
-
-add_definitions(-DTARGET_OS_MAC=1)
-add_definitions(-DHAVE_STDINT_H=1)
-add_definitions(-D__APPLE__ -D__DYNAMIC__)
-
-include_directories(${CMAKE_SOURCE_DIR}/src/launchd/liblaunch)
-include_directories(${CMAKE_SOURCE_DIR}/src/libc/darwin)
-include_directories(${CMAKE_SOURCE_DIR}/src/libc/gen)
-include_directories(${CMAKE_SOURCE_DIR}/src/libc/locale)
-include_directories(${CMAKE_SOURCE_DIR}/src/libc/locale/FreeBSD)
-include_directories(${CMAKE_SOURCE_DIR}/src/libc/stdtime/FreeBSD)
-include_directories(${CMAKE_SOURCE_DIR}/src/libmalloc/include)
-include_directories(${CMAKE_SOURCE_DIR}/src/kernel/libsyscall/wrappers/libproc)
-include_directories(${CMAKE_SOURCE_DIR}/src/kernel/emulation/linux/misc)
-include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/sandbox)
-include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src/external/libcxx/include)
-include_directories(${CMAKE_SOURCE_DIR}/src/libc/include)
-include_directories(${CMAKE_SOURCE_DIR}/src/external/libclosure)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/launch-cache)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include
-	${CMAKE_CURRENT_SOURCE_DIR}/include/mach-o)
-
-set(DYLIB_INSTALL_NAME "/usr/lib/system/libdyld.dylib")
-add_circular(system_dyld FAT
-	SOURCES
-	src/dyldAPIsInLibSystem.cpp
-	src/dyld_stub_binder.S
-	src/dyldLibSystemGlue.c
-	src/threadLocalHelpers.S
-	src/dyldLock.cpp
-	src/threadLocalVariables.c
-	src/start_glue.S
-	SIBLINGS
-		system_c system_kernel compiler_rt platform
-	DEPENDENCIES
-		launch
-)
-set_target_properties(system_dyld PROPERTIES
-	OUTPUT_NAME "dyld")
-set_property(TARGET system_dyld_obj APPEND_STRING PROPERTY
-	COMPILE_FLAGS " -fno-exceptions -fno-rtti")
-set_property(TARGET system_dyld APPEND_STRING PROPERTY
-	LINK_FLAGS " -Wl,-compatibility_version,1.0.0 -Wl,-current_version,421.1.0")
-#target_link_libraries(system_dyld PRIVATE platform_static32 platform_static64 system_c system_kernel compiler_rt launch)
-
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS_SAVED} -nostdlib")
-
-add_executable(system_loader
-	src/dyldAPIs.cpp
-	src/dyld.cpp
-	src/dyld_gdb.cpp
-	src/dyldInitialization.cpp
-	src/dyldNew.cpp
-	#src/dyld_process_info.cpp
-	#src/dyld_process_info_notify.cpp
-	src/ImageLoader.cpp
-	src/ImageLoaderMachOClassic.cpp
-	src/ImageLoaderMachOCompressed.cpp
-	src/ImageLoaderMachO.cpp
-	src/ImageLoaderMegaDylib.cpp
-	src/dyldExceptions.c
-	src/glue.c
-	src/dyldStartup.S
-	src/stub_binding_helper.S
-	src/start_glue.S
-	hell.c
-)
-
-use_ld64(system_loader)
-set_target_properties(system_loader PROPERTIES OUTPUT_NAME "dyld")
-set_property(TARGET system_loader APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-dylinker -Wl,-dead_strip -nostdlib -Wl,-e,__dyld_start -Wl,-image_base,0x1fe00000")
-target_link_libraries(system_loader libc_static system_blocks_static
-	libc_static32 libc_static64 cxx_static
-	unwind_static system_kernel_static system_m_static cxxabi_static
-	keymgr_static compiler_rt_static32 compiler_rt_static64 system_duct_static
-	platform_static32 platform_static64 pthread_static macho_static)
-
-make_fat(system_loader)
-
-install(TARGETS system_dyld DESTINATION libexec/darling/usr/lib/system)
-install(TARGETS system_loader DESTINATION libexec/darling/usr/lib)
diff --git a/src/dyld-apple/.clang-format b/src/dyld/.clang-format
similarity index 100%
rename from src/dyld-apple/.clang-format
rename to src/dyld/.clang-format
diff --git a/src/dyld-apple/APPLE_LICENSE b/src/dyld/APPLE_LICENSE
similarity index 100%
rename from src/dyld-apple/APPLE_LICENSE
rename to src/dyld/APPLE_LICENSE
diff --git a/src/dyld/CMakeLists.txt b/src/dyld/CMakeLists.txt
index a305a6f59..5d671f414 100644
--- a/src/dyld/CMakeLists.txt
+++ b/src/dyld/CMakeLists.txt
@@ -1,48 +1,96 @@
-project(dyld-bin)
+project(dyld-apple)
 
 cmake_minimum_required(VERSION 2.4.0)
 
 if(COMMAND cmake_policy)
-	cmake_policy(SET CMP0003 NEW)
-	cmake_policy(SET CMP0005 NEW)
+    cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
 
-enable_language(C ASM)
+include (darling_exe)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Ttext-segment,0x400000 -Wl,-Tbss,0x410000 -Wl,-Tdata,0x420000")
-add_definitions(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}" -D_GNU_SOURCE -DMLDR_BUILD)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc -std=c++11 -include ${CMAKE_SOURCE_DIR}/src/duct/include/CrashReporterClient.h")
+set(CMAKE_SHARED_LINKER_FLAGS_SAVED "${CMAKE_SHARED_LINKER_FLAGS}")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,-bind_at_load -Wl,-flat_namespace -Wl,-undefined,suppress")
 
-add_executable(darling darling.c)
+add_definitions(-DTARGET_OS_MAC=1)
+add_definitions(-DHAVE_STDINT_H=1)
+add_definitions(-D__APPLE__ -D__DYNAMIC__)
 
+include_directories(${CMAKE_SOURCE_DIR}/src/launchd/liblaunch)
+include_directories(${CMAKE_SOURCE_DIR}/src/libc/darwin)
+include_directories(${CMAKE_SOURCE_DIR}/src/libc/gen)
+include_directories(${CMAKE_SOURCE_DIR}/src/libc/locale)
+include_directories(${CMAKE_SOURCE_DIR}/src/libc/locale/FreeBSD)
+include_directories(${CMAKE_SOURCE_DIR}/src/libc/stdtime/FreeBSD)
+include_directories(${CMAKE_SOURCE_DIR}/src/libmalloc/include)
+include_directories(${CMAKE_SOURCE_DIR}/src/kernel/libsyscall/wrappers/libproc)
+include_directories(${CMAKE_SOURCE_DIR}/src/kernel/emulation/linux/misc)
+include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/sandbox)
+include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src/external/libcxx/include)
+include_directories(${CMAKE_SOURCE_DIR}/src/libc/include)
+include_directories(${CMAKE_SOURCE_DIR}/src/external/libclosure)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/launch-cache)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include
+	${CMAKE_CURRENT_SOURCE_DIR}/include/mach-o)
 
-set(mldr_sources
-	mldr.c
-	threads.c
-	gdb.c
-	commpage.c
-	elfcalls.c
+set(DYLIB_INSTALL_NAME "/usr/lib/system/libdyld.dylib")
+add_circular(system_dyld FAT
+	SOURCES
+	src/dyldAPIsInLibSystem.cpp
+	src/dyld_stub_binder.S
+	src/dyldLibSystemGlue.c
+	src/threadLocalHelpers.S
+	src/dyldLock.cpp
+	src/threadLocalVariables.c
+	src/start_glue.S
+	SIBLINGS
+		system_c system_kernel compiler_rt platform
+	DEPENDENCIES
+		launch
 )
-add_executable(mldr ${mldr_sources})
-target_link_libraries(mldr pthread dl)
-
-add_executable(mldr32 ${mldr_sources})
-target_link_libraries(mldr32 pthread dl)
-set_target_properties(mldr32
-	PROPERTIES
-		COMPILE_FLAGS "-m32"
-		LINK_FLAGS "-m32"
+set_target_properties(system_dyld PROPERTIES
+	OUTPUT_NAME "dyld")
+set_property(TARGET system_dyld_obj APPEND_STRING PROPERTY
+	COMPILE_FLAGS " -fno-exceptions -fno-rtti")
+set_property(TARGET system_dyld APPEND_STRING PROPERTY
+	LINK_FLAGS " -Wl,-compatibility_version,1.0.0 -Wl,-current_version,421.1.0")
+#target_link_libraries(system_dyld PRIVATE platform_static32 platform_static64 system_c system_kernel compiler_rt launch)
+
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS_SAVED} -nostdlib")
+
+add_executable(system_loader
+	src/dyldAPIs.cpp
+	src/dyld.cpp
+	src/dyld_gdb.cpp
+	src/dyldInitialization.cpp
+	src/dyldNew.cpp
+	#src/dyld_process_info.cpp
+	#src/dyld_process_info_notify.cpp
+	src/ImageLoader.cpp
+	src/ImageLoaderMachOClassic.cpp
+	src/ImageLoaderMachOCompressed.cpp
+	src/ImageLoaderMachO.cpp
+	src/ImageLoaderMegaDylib.cpp
+	src/dyldExceptions.c
+	src/glue.c
+	src/dyldStartup.S
+	src/stub_binding_helper.S
+	src/start_glue.S
+	hell.c
 )
 
-add_executable(wrapgen wrapgen/wrapgen.cpp)
-target_link_libraries(wrapgen dl)
+use_ld64(system_loader)
+set_target_properties(system_loader PROPERTIES OUTPUT_NAME "dyld")
+set_property(TARGET system_loader APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-dylinker -Wl,-dead_strip -nostdlib -Wl,-e,__dyld_start -Wl,-image_base,0x1fe00000")
+target_link_libraries(system_loader libc_static system_blocks_static
+	libc_static32 libc_static64 cxx_static
+	unwind_static system_kernel_static system_m_static cxxabi_static
+	keymgr_static compiler_rt_static32 compiler_rt_static64 system_duct_static
+	platform_static32 platform_static64 pthread_static macho_static)
+
+make_fat(system_loader)
 
-install(TARGETS mldr mldr32 DESTINATION libexec/darling/bin)
-install(TARGETS darling DESTINATION bin
-    PERMISSIONS
-    OWNER_READ OWNER_WRITE OWNER_EXECUTE
-    GROUP_READ GROUP_EXECUTE
-    WORLD_READ WORLD_EXECUTE
-    SETUID)
+install(TARGETS system_dyld DESTINATION libexec/darling/usr/lib/system)
+install(TARGETS system_loader DESTINATION libexec/darling/usr/lib)
diff --git a/src/dyld-apple/System b/src/dyld/System
similarity index 100%
rename from src/dyld-apple/System
rename to src/dyld/System
diff --git a/src/dyld-apple/bin/set-alt-dyld b/src/dyld/bin/set-alt-dyld
similarity index 100%
rename from src/dyld-apple/bin/set-alt-dyld
rename to src/dyld/bin/set-alt-dyld
diff --git a/src/dyld-apple/configs/base.xcconfig b/src/dyld/configs/base.xcconfig
similarity index 100%
rename from src/dyld-apple/configs/base.xcconfig
rename to src/dyld/configs/base.xcconfig
diff --git a/src/dyld-apple/configs/dyld.xcconfig b/src/dyld/configs/dyld.xcconfig
similarity index 100%
rename from src/dyld-apple/configs/dyld.xcconfig
rename to src/dyld/configs/dyld.xcconfig
diff --git a/src/dyld-apple/configs/libdyld.xcconfig b/src/dyld/configs/libdyld.xcconfig
similarity index 100%
rename from src/dyld-apple/configs/libdyld.xcconfig
rename to src/dyld/configs/libdyld.xcconfig
diff --git a/src/dyld-apple/configs/update_dyld_shared_cache.xcconfig b/src/dyld/configs/update_dyld_shared_cache.xcconfig
similarity index 100%
rename from src/dyld-apple/configs/update_dyld_shared_cache.xcconfig
rename to src/dyld/configs/update_dyld_shared_cache.xcconfig
diff --git a/src/dyld-apple/doc/ReleaseNotes.txt b/src/dyld/doc/ReleaseNotes.txt
similarity index 100%
rename from src/dyld-apple/doc/ReleaseNotes.txt
rename to src/dyld/doc/ReleaseNotes.txt
diff --git a/src/dyld-apple/doc/man/man1/dyld.1 b/src/dyld/doc/man/man1/dyld.1
similarity index 100%
rename from src/dyld-apple/doc/man/man1/dyld.1
rename to src/dyld/doc/man/man1/dyld.1
diff --git a/src/dyld-apple/doc/man/man1/update_dyld_shared_cache.1 b/src/dyld/doc/man/man1/update_dyld_shared_cache.1
similarity index 100%
rename from src/dyld-apple/doc/man/man1/update_dyld_shared_cache.1
rename to src/dyld/doc/man/man1/update_dyld_shared_cache.1
diff --git a/src/dyld-apple/doc/man/man3/dladdr.3 b/src/dyld/doc/man/man3/dladdr.3
similarity index 100%
rename from src/dyld-apple/doc/man/man3/dladdr.3
rename to src/dyld/doc/man/man3/dladdr.3
diff --git a/src/dyld-apple/doc/man/man3/dlclose.3 b/src/dyld/doc/man/man3/dlclose.3
similarity index 100%
rename from src/dyld-apple/doc/man/man3/dlclose.3
rename to src/dyld/doc/man/man3/dlclose.3
diff --git a/src/dyld-apple/doc/man/man3/dlerror.3 b/src/dyld/doc/man/man3/dlerror.3
similarity index 100%
rename from src/dyld-apple/doc/man/man3/dlerror.3
rename to src/dyld/doc/man/man3/dlerror.3
diff --git a/src/dyld-apple/doc/man/man3/dlopen.3 b/src/dyld/doc/man/man3/dlopen.3
similarity index 100%
rename from src/dyld-apple/doc/man/man3/dlopen.3
rename to src/dyld/doc/man/man3/dlopen.3
diff --git a/src/dyld-apple/doc/man/man3/dlopen_preflight.3 b/src/dyld/doc/man/man3/dlopen_preflight.3
similarity index 100%
rename from src/dyld-apple/doc/man/man3/dlopen_preflight.3
rename to src/dyld/doc/man/man3/dlopen_preflight.3
diff --git a/src/dyld-apple/doc/man/man3/dlsym.3 b/src/dyld/doc/man/man3/dlsym.3
similarity index 100%
rename from src/dyld-apple/doc/man/man3/dlsym.3
rename to src/dyld/doc/man/man3/dlsym.3
diff --git a/src/dyld-apple/doc/man/man3/dyld.3 b/src/dyld/doc/man/man3/dyld.3
similarity index 100%
rename from src/dyld-apple/doc/man/man3/dyld.3
rename to src/dyld/doc/man/man3/dyld.3
diff --git a/src/dyld-apple/dyld.xcodeproj/project.pbxproj b/src/dyld/dyld.xcodeproj/project.pbxproj
similarity index 100%
rename from src/dyld-apple/dyld.xcodeproj/project.pbxproj
rename to src/dyld/dyld.xcodeproj/project.pbxproj
diff --git a/src/dyld-apple/dyld_kernel.h b/src/dyld/dyld_kernel.h
similarity index 100%
rename from src/dyld-apple/dyld_kernel.h
rename to src/dyld/dyld_kernel.h
diff --git a/src/dyld-apple/dyld_sim-entitlements.plist b/src/dyld/dyld_sim-entitlements.plist
similarity index 100%
rename from src/dyld-apple/dyld_sim-entitlements.plist
rename to src/dyld/dyld_sim-entitlements.plist
diff --git a/src/dyld-apple/hell.c b/src/dyld/hell.c
similarity index 100%
rename from src/dyld-apple/hell.c
rename to src/dyld/hell.c
diff --git a/src/dyld-apple/include/dlfcn.h b/src/dyld/include/dlfcn.h
similarity index 100%
rename from src/dyld-apple/include/dlfcn.h
rename to src/dyld/include/dlfcn.h
diff --git a/src/dyld-apple/include/mach-o/dyld-interposing.h b/src/dyld/include/mach-o/dyld-interposing.h
similarity index 100%
rename from src/dyld-apple/include/mach-o/dyld-interposing.h
rename to src/dyld/include/mach-o/dyld-interposing.h
diff --git a/src/dyld-apple/include/mach-o/dyld.h b/src/dyld/include/mach-o/dyld.h
similarity index 100%
rename from src/dyld-apple/include/mach-o/dyld.h
rename to src/dyld/include/mach-o/dyld.h
diff --git a/src/dyld-apple/include/mach-o/dyld_gdb.h b/src/dyld/include/mach-o/dyld_gdb.h
similarity index 100%
rename from src/dyld-apple/include/mach-o/dyld_gdb.h
rename to src/dyld/include/mach-o/dyld_gdb.h
diff --git a/src/dyld-apple/include/mach-o/dyld_images.h b/src/dyld/include/mach-o/dyld_images.h
similarity index 100%
rename from src/dyld-apple/include/mach-o/dyld_images.h
rename to src/dyld/include/mach-o/dyld_images.h
diff --git a/src/dyld-apple/include/mach-o/dyld_priv.h b/src/dyld/include/mach-o/dyld_priv.h
similarity index 100%
rename from src/dyld-apple/include/mach-o/dyld_priv.h
rename to src/dyld/include/mach-o/dyld_priv.h
diff --git a/src/dyld-apple/include/mach-o/dyld_process_info.h b/src/dyld/include/mach-o/dyld_process_info.h
similarity index 100%
rename from src/dyld-apple/include/mach-o/dyld_process_info.h
rename to src/dyld/include/mach-o/dyld_process_info.h
diff --git a/src/dyld-apple/include/objc-shared-cache.h b/src/dyld/include/objc-shared-cache.h
similarity index 100%
rename from src/dyld-apple/include/objc-shared-cache.h
rename to src/dyld/include/objc-shared-cache.h
diff --git a/src/dyld-apple/interlinked-dylibs/AdjustForNewSegmentLocation.cpp b/src/dyld/interlinked-dylibs/AdjustForNewSegmentLocation.cpp
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/AdjustForNewSegmentLocation.cpp
rename to src/dyld/interlinked-dylibs/AdjustForNewSegmentLocation.cpp
diff --git a/src/dyld-apple/interlinked-dylibs/BindAllImages.cpp b/src/dyld/interlinked-dylibs/BindAllImages.cpp
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/BindAllImages.cpp
rename to src/dyld/interlinked-dylibs/BindAllImages.cpp
diff --git a/src/dyld-apple/interlinked-dylibs/CodeSigningTypes.h b/src/dyld/interlinked-dylibs/CodeSigningTypes.h
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/CodeSigningTypes.h
rename to src/dyld/interlinked-dylibs/CodeSigningTypes.h
diff --git a/src/dyld-apple/interlinked-dylibs/FileCache.cpp b/src/dyld/interlinked-dylibs/FileCache.cpp
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/FileCache.cpp
rename to src/dyld/interlinked-dylibs/FileCache.cpp
diff --git a/src/dyld-apple/interlinked-dylibs/Logging.cpp b/src/dyld/interlinked-dylibs/Logging.cpp
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/Logging.cpp
rename to src/dyld/interlinked-dylibs/Logging.cpp
diff --git a/src/dyld-apple/interlinked-dylibs/Logging.h b/src/dyld/interlinked-dylibs/Logging.h
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/Logging.h
rename to src/dyld/interlinked-dylibs/Logging.h
diff --git a/src/dyld-apple/interlinked-dylibs/MachOProxy.cpp b/src/dyld/interlinked-dylibs/MachOProxy.cpp
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/MachOProxy.cpp
rename to src/dyld/interlinked-dylibs/MachOProxy.cpp
diff --git a/src/dyld-apple/interlinked-dylibs/MachOProxy.h b/src/dyld/interlinked-dylibs/MachOProxy.h
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/MachOProxy.h
rename to src/dyld/interlinked-dylibs/MachOProxy.h
diff --git a/src/dyld-apple/interlinked-dylibs/Manifest.h b/src/dyld/interlinked-dylibs/Manifest.h
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/Manifest.h
rename to src/dyld/interlinked-dylibs/Manifest.h
diff --git a/src/dyld-apple/interlinked-dylibs/Manifest.mm b/src/dyld/interlinked-dylibs/Manifest.mm
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/Manifest.mm
rename to src/dyld/interlinked-dylibs/Manifest.mm
diff --git a/src/dyld-apple/interlinked-dylibs/MultiCacheBuilder.h b/src/dyld/interlinked-dylibs/MultiCacheBuilder.h
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/MultiCacheBuilder.h
rename to src/dyld/interlinked-dylibs/MultiCacheBuilder.h
diff --git a/src/dyld-apple/interlinked-dylibs/MultiCacheBuilder.mm b/src/dyld/interlinked-dylibs/MultiCacheBuilder.mm
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/MultiCacheBuilder.mm
rename to src/dyld/interlinked-dylibs/MultiCacheBuilder.mm
diff --git a/src/dyld-apple/interlinked-dylibs/ObjC1Abstraction.hpp b/src/dyld/interlinked-dylibs/ObjC1Abstraction.hpp
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/ObjC1Abstraction.hpp
rename to src/dyld/interlinked-dylibs/ObjC1Abstraction.hpp
diff --git a/src/dyld-apple/interlinked-dylibs/ObjC2Abstraction.hpp b/src/dyld/interlinked-dylibs/ObjC2Abstraction.hpp
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/ObjC2Abstraction.hpp
rename to src/dyld/interlinked-dylibs/ObjC2Abstraction.hpp
diff --git a/src/dyld-apple/interlinked-dylibs/OptimizerBranches.cpp b/src/dyld/interlinked-dylibs/OptimizerBranches.cpp
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/OptimizerBranches.cpp
rename to src/dyld/interlinked-dylibs/OptimizerBranches.cpp
diff --git a/src/dyld-apple/interlinked-dylibs/OptimizerBranches.h b/src/dyld/interlinked-dylibs/OptimizerBranches.h
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/OptimizerBranches.h
rename to src/dyld/interlinked-dylibs/OptimizerBranches.h
diff --git a/src/dyld-apple/interlinked-dylibs/OptimizerLinkedit.cpp b/src/dyld/interlinked-dylibs/OptimizerLinkedit.cpp
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/OptimizerLinkedit.cpp
rename to src/dyld/interlinked-dylibs/OptimizerLinkedit.cpp
diff --git a/src/dyld-apple/interlinked-dylibs/OptimizerObjC.cpp b/src/dyld/interlinked-dylibs/OptimizerObjC.cpp
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/OptimizerObjC.cpp
rename to src/dyld/interlinked-dylibs/OptimizerObjC.cpp
diff --git a/src/dyld-apple/interlinked-dylibs/SharedCache.cpp b/src/dyld/interlinked-dylibs/SharedCache.cpp
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/SharedCache.cpp
rename to src/dyld/interlinked-dylibs/SharedCache.cpp
diff --git a/src/dyld-apple/interlinked-dylibs/Trie.hpp b/src/dyld/interlinked-dylibs/Trie.hpp
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/Trie.hpp
rename to src/dyld/interlinked-dylibs/Trie.hpp
diff --git a/src/dyld-apple/interlinked-dylibs/dyld_shared_cache_builder.mm b/src/dyld/interlinked-dylibs/dyld_shared_cache_builder.mm
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/dyld_shared_cache_builder.mm
rename to src/dyld/interlinked-dylibs/dyld_shared_cache_builder.mm
diff --git a/src/dyld-apple/interlinked-dylibs/mega-dylib-utils.h b/src/dyld/interlinked-dylibs/mega-dylib-utils.h
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/mega-dylib-utils.h
rename to src/dyld/interlinked-dylibs/mega-dylib-utils.h
diff --git a/src/dyld-apple/interlinked-dylibs/multi_dyld_shared_cache_builder.mm b/src/dyld/interlinked-dylibs/multi_dyld_shared_cache_builder.mm
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/multi_dyld_shared_cache_builder.mm
rename to src/dyld/interlinked-dylibs/multi_dyld_shared_cache_builder.mm
diff --git a/src/dyld-apple/interlinked-dylibs/update_dyld_shared_cache.mm b/src/dyld/interlinked-dylibs/update_dyld_shared_cache.mm
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/update_dyld_shared_cache.mm
rename to src/dyld/interlinked-dylibs/update_dyld_shared_cache.mm
diff --git a/src/dyld-apple/interlinked-dylibs/update_dyld_shared_cache_compat.cpp b/src/dyld/interlinked-dylibs/update_dyld_shared_cache_compat.cpp
similarity index 100%
rename from src/dyld-apple/interlinked-dylibs/update_dyld_shared_cache_compat.cpp
rename to src/dyld/interlinked-dylibs/update_dyld_shared_cache_compat.cpp
diff --git a/src/dyld-apple/launch-cache/Architectures.hpp b/src/dyld/launch-cache/Architectures.hpp
similarity index 100%
rename from src/dyld-apple/launch-cache/Architectures.hpp
rename to src/dyld/launch-cache/Architectures.hpp
diff --git a/src/dyld-apple/launch-cache/CacheFileAbstraction.hpp b/src/dyld/launch-cache/CacheFileAbstraction.hpp
similarity index 100%
rename from src/dyld-apple/launch-cache/CacheFileAbstraction.hpp
rename to src/dyld/launch-cache/CacheFileAbstraction.hpp
diff --git a/src/dyld-apple/launch-cache/FileAbstraction.hpp b/src/dyld/launch-cache/FileAbstraction.hpp
similarity index 100%
rename from src/dyld-apple/launch-cache/FileAbstraction.hpp
rename to src/dyld/launch-cache/FileAbstraction.hpp
diff --git a/src/dyld-apple/launch-cache/MachOBinder.hpp b/src/dyld/launch-cache/MachOBinder.hpp
similarity index 100%
rename from src/dyld-apple/launch-cache/MachOBinder.hpp
rename to src/dyld/launch-cache/MachOBinder.hpp
diff --git a/src/dyld-apple/launch-cache/MachOFileAbstraction.hpp b/src/dyld/launch-cache/MachOFileAbstraction.hpp
similarity index 100%
rename from src/dyld-apple/launch-cache/MachOFileAbstraction.hpp
rename to src/dyld/launch-cache/MachOFileAbstraction.hpp
diff --git a/src/dyld-apple/launch-cache/MachOLayout.hpp b/src/dyld/launch-cache/MachOLayout.hpp
similarity index 100%
rename from src/dyld-apple/launch-cache/MachOLayout.hpp
rename to src/dyld/launch-cache/MachOLayout.hpp
diff --git a/src/dyld-apple/launch-cache/MachORebaser.hpp b/src/dyld/launch-cache/MachORebaser.hpp
similarity index 100%
rename from src/dyld-apple/launch-cache/MachORebaser.hpp
rename to src/dyld/launch-cache/MachORebaser.hpp
diff --git a/src/dyld-apple/launch-cache/MachOTrie.hpp b/src/dyld/launch-cache/MachOTrie.hpp
similarity index 100%
rename from src/dyld-apple/launch-cache/MachOTrie.hpp
rename to src/dyld/launch-cache/MachOTrie.hpp
diff --git a/src/dyld-apple/launch-cache/dsc_extractor.cpp b/src/dyld/launch-cache/dsc_extractor.cpp
similarity index 100%
rename from src/dyld-apple/launch-cache/dsc_extractor.cpp
rename to src/dyld/launch-cache/dsc_extractor.cpp
diff --git a/src/dyld-apple/launch-cache/dsc_extractor.h b/src/dyld/launch-cache/dsc_extractor.h
similarity index 100%
rename from src/dyld-apple/launch-cache/dsc_extractor.h
rename to src/dyld/launch-cache/dsc_extractor.h
diff --git a/src/dyld-apple/launch-cache/dsc_iterator.cpp b/src/dyld/launch-cache/dsc_iterator.cpp
similarity index 100%
rename from src/dyld-apple/launch-cache/dsc_iterator.cpp
rename to src/dyld/launch-cache/dsc_iterator.cpp
diff --git a/src/dyld-apple/launch-cache/dsc_iterator.h b/src/dyld/launch-cache/dsc_iterator.h
similarity index 100%
rename from src/dyld-apple/launch-cache/dsc_iterator.h
rename to src/dyld/launch-cache/dsc_iterator.h
diff --git a/src/dyld-apple/launch-cache/dyld_cache_format.h b/src/dyld/launch-cache/dyld_cache_format.h
similarity index 100%
rename from src/dyld-apple/launch-cache/dyld_cache_format.h
rename to src/dyld/launch-cache/dyld_cache_format.h
diff --git a/src/dyld-apple/launch-cache/dyld_shared_cache_util.cpp b/src/dyld/launch-cache/dyld_shared_cache_util.cpp
similarity index 100%
rename from src/dyld-apple/launch-cache/dyld_shared_cache_util.cpp
rename to src/dyld/launch-cache/dyld_shared_cache_util.cpp
diff --git a/src/dyld-apple/launch-cache/update_dyld_shared_cache_entitlements.plist b/src/dyld/launch-cache/update_dyld_shared_cache_entitlements.plist
similarity index 100%
rename from src/dyld-apple/launch-cache/update_dyld_shared_cache_entitlements.plist
rename to src/dyld/launch-cache/update_dyld_shared_cache_entitlements.plist
diff --git a/src/dyld-apple/src/ImageLoader.cpp b/src/dyld/src/ImageLoader.cpp
similarity index 100%
rename from src/dyld-apple/src/ImageLoader.cpp
rename to src/dyld/src/ImageLoader.cpp
diff --git a/src/dyld-apple/src/ImageLoader.h b/src/dyld/src/ImageLoader.h
similarity index 100%
rename from src/dyld-apple/src/ImageLoader.h
rename to src/dyld/src/ImageLoader.h
diff --git a/src/dyld-apple/src/ImageLoaderMachO.cpp b/src/dyld/src/ImageLoaderMachO.cpp
similarity index 100%
rename from src/dyld-apple/src/ImageLoaderMachO.cpp
rename to src/dyld/src/ImageLoaderMachO.cpp
diff --git a/src/dyld-apple/src/ImageLoaderMachO.h b/src/dyld/src/ImageLoaderMachO.h
similarity index 100%
rename from src/dyld-apple/src/ImageLoaderMachO.h
rename to src/dyld/src/ImageLoaderMachO.h
diff --git a/src/dyld-apple/src/ImageLoaderMachOClassic.cpp b/src/dyld/src/ImageLoaderMachOClassic.cpp
similarity index 100%
rename from src/dyld-apple/src/ImageLoaderMachOClassic.cpp
rename to src/dyld/src/ImageLoaderMachOClassic.cpp
diff --git a/src/dyld-apple/src/ImageLoaderMachOClassic.h b/src/dyld/src/ImageLoaderMachOClassic.h
similarity index 100%
rename from src/dyld-apple/src/ImageLoaderMachOClassic.h
rename to src/dyld/src/ImageLoaderMachOClassic.h
diff --git a/src/dyld-apple/src/ImageLoaderMachOCompressed.cpp b/src/dyld/src/ImageLoaderMachOCompressed.cpp
similarity index 100%
rename from src/dyld-apple/src/ImageLoaderMachOCompressed.cpp
rename to src/dyld/src/ImageLoaderMachOCompressed.cpp
diff --git a/src/dyld-apple/src/ImageLoaderMachOCompressed.h b/src/dyld/src/ImageLoaderMachOCompressed.h
similarity index 100%
rename from src/dyld-apple/src/ImageLoaderMachOCompressed.h
rename to src/dyld/src/ImageLoaderMachOCompressed.h
diff --git a/src/dyld-apple/src/ImageLoaderMegaDylib.cpp b/src/dyld/src/ImageLoaderMegaDylib.cpp
similarity index 100%
rename from src/dyld-apple/src/ImageLoaderMegaDylib.cpp
rename to src/dyld/src/ImageLoaderMegaDylib.cpp
diff --git a/src/dyld-apple/src/ImageLoaderMegaDylib.h b/src/dyld/src/ImageLoaderMegaDylib.h
similarity index 100%
rename from src/dyld-apple/src/ImageLoaderMegaDylib.h
rename to src/dyld/src/ImageLoaderMegaDylib.h
diff --git a/src/dyld-apple/src/dyld.cpp b/src/dyld/src/dyld.cpp
similarity index 100%
rename from src/dyld-apple/src/dyld.cpp
rename to src/dyld/src/dyld.cpp
diff --git a/src/dyld-apple/src/dyld.exp b/src/dyld/src/dyld.exp
similarity index 100%
rename from src/dyld-apple/src/dyld.exp
rename to src/dyld/src/dyld.exp
diff --git a/src/dyld-apple/src/dyld.h b/src/dyld/src/dyld.h
similarity index 100%
rename from src/dyld-apple/src/dyld.h
rename to src/dyld/src/dyld.h
diff --git a/src/dyld-apple/src/dyld.order b/src/dyld/src/dyld.order
similarity index 100%
rename from src/dyld-apple/src/dyld.order
rename to src/dyld/src/dyld.order
diff --git a/src/dyld-apple/src/dyldAPIs.cpp b/src/dyld/src/dyldAPIs.cpp
similarity index 100%
rename from src/dyld-apple/src/dyldAPIs.cpp
rename to src/dyld/src/dyldAPIs.cpp
diff --git a/src/dyld-apple/src/dyldAPIsInLibSystem.cpp b/src/dyld/src/dyldAPIsInLibSystem.cpp
similarity index 100%
rename from src/dyld-apple/src/dyldAPIsInLibSystem.cpp
rename to src/dyld/src/dyldAPIsInLibSystem.cpp
diff --git a/src/dyld-apple/src/dyldExceptions.c b/src/dyld/src/dyldExceptions.c
similarity index 100%
rename from src/dyld-apple/src/dyldExceptions.c
rename to src/dyld/src/dyldExceptions.c
diff --git a/src/dyld-apple/src/dyldInitialization.cpp b/src/dyld/src/dyldInitialization.cpp
similarity index 100%
rename from src/dyld-apple/src/dyldInitialization.cpp
rename to src/dyld/src/dyldInitialization.cpp
diff --git a/src/dyld-apple/src/dyldLibSystemGlue.c b/src/dyld/src/dyldLibSystemGlue.c
similarity index 100%
rename from src/dyld-apple/src/dyldLibSystemGlue.c
rename to src/dyld/src/dyldLibSystemGlue.c
diff --git a/src/dyld-apple/src/dyldLibSystemInterface.h b/src/dyld/src/dyldLibSystemInterface.h
similarity index 100%
rename from src/dyld-apple/src/dyldLibSystemInterface.h
rename to src/dyld/src/dyldLibSystemInterface.h
diff --git a/src/dyld-apple/src/dyldLock.cpp b/src/dyld/src/dyldLock.cpp
similarity index 100%
rename from src/dyld-apple/src/dyldLock.cpp
rename to src/dyld/src/dyldLock.cpp
diff --git a/src/dyld-apple/src/dyldLock.h b/src/dyld/src/dyldLock.h
similarity index 100%
rename from src/dyld-apple/src/dyldLock.h
rename to src/dyld/src/dyldLock.h
diff --git a/src/dyld-apple/src/dyldNew.cpp b/src/dyld/src/dyldNew.cpp
similarity index 100%
rename from src/dyld-apple/src/dyldNew.cpp
rename to src/dyld/src/dyldNew.cpp
diff --git a/src/dyld-apple/src/dyldStartup.S b/src/dyld/src/dyldStartup.S
similarity index 100%
rename from src/dyld-apple/src/dyldStartup.S
rename to src/dyld/src/dyldStartup.S
diff --git a/src/dyld-apple/src/dyldSyscallInterface.h b/src/dyld/src/dyldSyscallInterface.h
similarity index 100%
rename from src/dyld-apple/src/dyldSyscallInterface.h
rename to src/dyld/src/dyldSyscallInterface.h
diff --git a/src/dyld-apple/src/dyld_gdb.cpp b/src/dyld/src/dyld_gdb.cpp
similarity index 100%
rename from src/dyld-apple/src/dyld_gdb.cpp
rename to src/dyld/src/dyld_gdb.cpp
diff --git a/src/dyld-apple/src/dyld_process_info.cpp b/src/dyld/src/dyld_process_info.cpp
similarity index 100%
rename from src/dyld-apple/src/dyld_process_info.cpp
rename to src/dyld/src/dyld_process_info.cpp
diff --git a/src/dyld-apple/src/dyld_process_info_internal.h b/src/dyld/src/dyld_process_info_internal.h
similarity index 100%
rename from src/dyld-apple/src/dyld_process_info_internal.h
rename to src/dyld/src/dyld_process_info_internal.h
diff --git a/src/dyld-apple/src/dyld_process_info_notify.cpp b/src/dyld/src/dyld_process_info_notify.cpp
similarity index 100%
rename from src/dyld-apple/src/dyld_process_info_notify.cpp
rename to src/dyld/src/dyld_process_info_notify.cpp
diff --git a/src/dyld-apple/src/dyld_sim.exp b/src/dyld/src/dyld_sim.exp
similarity index 100%
rename from src/dyld-apple/src/dyld_sim.exp
rename to src/dyld/src/dyld_sim.exp
diff --git a/src/dyld-apple/src/dyld_stub_binder.S b/src/dyld/src/dyld_stub_binder.S
similarity index 100%
rename from src/dyld-apple/src/dyld_stub_binder.S
rename to src/dyld/src/dyld_stub_binder.S
diff --git a/src/dyld-apple/src/glue.c b/src/dyld/src/glue.c
similarity index 100%
rename from src/dyld-apple/src/glue.c
rename to src/dyld/src/glue.c
diff --git a/src/dyld-apple/src/libdyld_data_symbols.dirty b/src/dyld/src/libdyld_data_symbols.dirty
similarity index 100%
rename from src/dyld-apple/src/libdyld_data_symbols.dirty
rename to src/dyld/src/libdyld_data_symbols.dirty
diff --git a/src/dyld-apple/src/libdyld_sim.exp b/src/dyld/src/libdyld_sim.exp
similarity index 100%
rename from src/dyld-apple/src/libdyld_sim.exp
rename to src/dyld/src/libdyld_sim.exp
diff --git a/src/dyld-apple/src/start_glue.S b/src/dyld/src/start_glue.S
similarity index 100%
rename from src/dyld-apple/src/start_glue.S
rename to src/dyld/src/start_glue.S
diff --git a/src/dyld-apple/src/start_glue.h b/src/dyld/src/start_glue.h
similarity index 100%
rename from src/dyld-apple/src/start_glue.h
rename to src/dyld/src/start_glue.h
diff --git a/src/dyld-apple/src/stub_binding_helper.S b/src/dyld/src/stub_binding_helper.S
similarity index 100%
rename from src/dyld-apple/src/stub_binding_helper.S
rename to src/dyld/src/stub_binding_helper.S
diff --git a/src/dyld-apple/src/threadLocalHelpers.S b/src/dyld/src/threadLocalHelpers.S
similarity index 100%
rename from src/dyld-apple/src/threadLocalHelpers.S
rename to src/dyld/src/threadLocalHelpers.S
diff --git a/src/dyld-apple/src/threadLocalVariables.c b/src/dyld/src/threadLocalVariables.c
similarity index 100%
rename from src/dyld-apple/src/threadLocalVariables.c
rename to src/dyld/src/threadLocalVariables.c
diff --git a/src/dyld-apple/testing/README.txt b/src/dyld/testing/README.txt
similarity index 100%
rename from src/dyld-apple/testing/README.txt
rename to src/dyld/testing/README.txt
diff --git a/src/dyld-apple/testing/build_tests.py b/src/dyld/testing/build_tests.py
similarity index 100%
rename from src/dyld-apple/testing/build_tests.py
rename to src/dyld/testing/build_tests.py
diff --git a/src/dyld-apple/testing/nocr/execserver.defs b/src/dyld/testing/nocr/execserver.defs
similarity index 100%
rename from src/dyld-apple/testing/nocr/execserver.defs
rename to src/dyld/testing/nocr/execserver.defs
diff --git a/src/dyld-apple/testing/nocr/nocr.1 b/src/dyld/testing/nocr/nocr.1
similarity index 100%
rename from src/dyld-apple/testing/nocr/nocr.1
rename to src/dyld/testing/nocr/nocr.1
diff --git a/src/dyld-apple/testing/nocr/nocr.c b/src/dyld/testing/nocr/nocr.c
similarity index 100%
rename from src/dyld-apple/testing/nocr/nocr.c
rename to src/dyld/testing/nocr/nocr.c
diff --git a/src/dyld-apple/testing/run_all_dyld_tests.py b/src/dyld/testing/run_all_dyld_tests.py
similarity index 100%
rename from src/dyld-apple/testing/run_all_dyld_tests.py
rename to src/dyld/testing/run_all_dyld_tests.py
diff --git a/src/dyld-apple/testing/task_for_pid_entitlement.plist b/src/dyld/testing/task_for_pid_entitlement.plist
similarity index 100%
rename from src/dyld-apple/testing/task_for_pid_entitlement.plist
rename to src/dyld/testing/task_for_pid_entitlement.plist
diff --git a/src/dyld-apple/testing/test-cases/NSAddImage-basic.dtest/main.c b/src/dyld/testing/test-cases/NSAddImage-basic.dtest/main.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/NSAddImage-basic.dtest/main.c
rename to src/dyld/testing/test-cases/NSAddImage-basic.dtest/main.c
diff --git a/src/dyld-apple/testing/test-cases/NSAddImage-basic.dtest/zzz.c b/src/dyld/testing/test-cases/NSAddImage-basic.dtest/zzz.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/NSAddImage-basic.dtest/zzz.c
rename to src/dyld/testing/test-cases/NSAddImage-basic.dtest/zzz.c
diff --git a/src/dyld-apple/testing/test-cases/dlopen-basic.dtest/foo.c b/src/dyld/testing/test-cases/dlopen-basic.dtest/foo.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dlopen-basic.dtest/foo.c
rename to src/dyld/testing/test-cases/dlopen-basic.dtest/foo.c
diff --git a/src/dyld-apple/testing/test-cases/dlopen-basic.dtest/main.c b/src/dyld/testing/test-cases/dlopen-basic.dtest/main.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dlopen-basic.dtest/main.c
rename to src/dyld/testing/test-cases/dlopen-basic.dtest/main.c
diff --git a/src/dyld-apple/testing/test-cases/dlopen-framework-fallback.dtest/main.c b/src/dyld/testing/test-cases/dlopen-framework-fallback.dtest/main.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dlopen-framework-fallback.dtest/main.c
rename to src/dyld/testing/test-cases/dlopen-framework-fallback.dtest/main.c
diff --git a/src/dyld-apple/testing/test-cases/dlopen-signing.dtest/dylib.c b/src/dyld/testing/test-cases/dlopen-signing.dtest/dylib.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dlopen-signing.dtest/dylib.c
rename to src/dyld/testing/test-cases/dlopen-signing.dtest/dylib.c
diff --git a/src/dyld-apple/testing/test-cases/dlopen-signing.dtest/main.c b/src/dyld/testing/test-cases/dlopen-signing.dtest/main.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dlopen-signing.dtest/main.c
rename to src/dyld/testing/test-cases/dlopen-signing.dtest/main.c
diff --git a/src/dyld-apple/testing/test-cases/dyld_abort_payload.dtest/defSymbol.c b/src/dyld/testing/test-cases/dyld_abort_payload.dtest/defSymbol.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dyld_abort_payload.dtest/defSymbol.c
rename to src/dyld/testing/test-cases/dyld_abort_payload.dtest/defSymbol.c
diff --git a/src/dyld-apple/testing/test-cases/dyld_abort_payload.dtest/emptyMain.c b/src/dyld/testing/test-cases/dyld_abort_payload.dtest/emptyMain.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dyld_abort_payload.dtest/emptyMain.c
rename to src/dyld/testing/test-cases/dyld_abort_payload.dtest/emptyMain.c
diff --git a/src/dyld-apple/testing/test-cases/dyld_abort_payload.dtest/foo.c b/src/dyld/testing/test-cases/dyld_abort_payload.dtest/foo.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dyld_abort_payload.dtest/foo.c
rename to src/dyld/testing/test-cases/dyld_abort_payload.dtest/foo.c
diff --git a/src/dyld-apple/testing/test-cases/dyld_abort_payload.dtest/main.c b/src/dyld/testing/test-cases/dyld_abort_payload.dtest/main.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dyld_abort_payload.dtest/main.c
rename to src/dyld/testing/test-cases/dyld_abort_payload.dtest/main.c
diff --git a/src/dyld-apple/testing/test-cases/dyld_abort_payload.dtest/useSymbol.c b/src/dyld/testing/test-cases/dyld_abort_payload.dtest/useSymbol.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dyld_abort_payload.dtest/useSymbol.c
rename to src/dyld/testing/test-cases/dyld_abort_payload.dtest/useSymbol.c
diff --git a/src/dyld-apple/testing/test-cases/dyld_process_info.dtest/linksWithCF.c b/src/dyld/testing/test-cases/dyld_process_info.dtest/linksWithCF.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dyld_process_info.dtest/linksWithCF.c
rename to src/dyld/testing/test-cases/dyld_process_info.dtest/linksWithCF.c
diff --git a/src/dyld-apple/testing/test-cases/dyld_process_info.dtest/main.c b/src/dyld/testing/test-cases/dyld_process_info.dtest/main.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dyld_process_info.dtest/main.c
rename to src/dyld/testing/test-cases/dyld_process_info.dtest/main.c
diff --git a/src/dyld-apple/testing/test-cases/dyld_process_info_notify.dtest/foo.c b/src/dyld/testing/test-cases/dyld_process_info_notify.dtest/foo.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dyld_process_info_notify.dtest/foo.c
rename to src/dyld/testing/test-cases/dyld_process_info_notify.dtest/foo.c
diff --git a/src/dyld-apple/testing/test-cases/dyld_process_info_notify.dtest/main.c b/src/dyld/testing/test-cases/dyld_process_info_notify.dtest/main.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dyld_process_info_notify.dtest/main.c
rename to src/dyld/testing/test-cases/dyld_process_info_notify.dtest/main.c
diff --git a/src/dyld-apple/testing/test-cases/dyld_process_info_notify.dtest/target.c b/src/dyld/testing/test-cases/dyld_process_info_notify.dtest/target.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dyld_process_info_notify.dtest/target.c
rename to src/dyld/testing/test-cases/dyld_process_info_notify.dtest/target.c
diff --git a/src/dyld-apple/testing/test-cases/dylib-re-export-old-format.dtest/bar.c b/src/dyld/testing/test-cases/dylib-re-export-old-format.dtest/bar.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dylib-re-export-old-format.dtest/bar.c
rename to src/dyld/testing/test-cases/dylib-re-export-old-format.dtest/bar.c
diff --git a/src/dyld-apple/testing/test-cases/dylib-re-export-old-format.dtest/foo.c b/src/dyld/testing/test-cases/dylib-re-export-old-format.dtest/foo.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dylib-re-export-old-format.dtest/foo.c
rename to src/dyld/testing/test-cases/dylib-re-export-old-format.dtest/foo.c
diff --git a/src/dyld-apple/testing/test-cases/dylib-re-export-old-format.dtest/main.c b/src/dyld/testing/test-cases/dylib-re-export-old-format.dtest/main.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dylib-re-export-old-format.dtest/main.c
rename to src/dyld/testing/test-cases/dylib-re-export-old-format.dtest/main.c
diff --git a/src/dyld-apple/testing/test-cases/dylib-re-export.dtest/bar.c b/src/dyld/testing/test-cases/dylib-re-export.dtest/bar.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dylib-re-export.dtest/bar.c
rename to src/dyld/testing/test-cases/dylib-re-export.dtest/bar.c
diff --git a/src/dyld-apple/testing/test-cases/dylib-re-export.dtest/foo.c b/src/dyld/testing/test-cases/dylib-re-export.dtest/foo.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dylib-re-export.dtest/foo.c
rename to src/dyld/testing/test-cases/dylib-re-export.dtest/foo.c
diff --git a/src/dyld-apple/testing/test-cases/dylib-re-export.dtest/main.c b/src/dyld/testing/test-cases/dylib-re-export.dtest/main.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dylib-re-export.dtest/main.c
rename to src/dyld/testing/test-cases/dylib-re-export.dtest/main.c
diff --git a/src/dyld-apple/testing/test-cases/dylib-static-link.dtest/foo.c b/src/dyld/testing/test-cases/dylib-static-link.dtest/foo.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dylib-static-link.dtest/foo.c
rename to src/dyld/testing/test-cases/dylib-static-link.dtest/foo.c
diff --git a/src/dyld-apple/testing/test-cases/dylib-static-link.dtest/missing.c b/src/dyld/testing/test-cases/dylib-static-link.dtest/missing.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dylib-static-link.dtest/missing.c
rename to src/dyld/testing/test-cases/dylib-static-link.dtest/missing.c
diff --git a/src/dyld-apple/testing/test-cases/dylib-static-link.dtest/present.c b/src/dyld/testing/test-cases/dylib-static-link.dtest/present.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dylib-static-link.dtest/present.c
rename to src/dyld/testing/test-cases/dylib-static-link.dtest/present.c
diff --git a/src/dyld-apple/testing/test-cases/dylib-static-weak-link.dtest/foo.c b/src/dyld/testing/test-cases/dylib-static-weak-link.dtest/foo.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dylib-static-weak-link.dtest/foo.c
rename to src/dyld/testing/test-cases/dylib-static-weak-link.dtest/foo.c
diff --git a/src/dyld-apple/testing/test-cases/dylib-static-weak-link.dtest/missing.c b/src/dyld/testing/test-cases/dylib-static-weak-link.dtest/missing.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dylib-static-weak-link.dtest/missing.c
rename to src/dyld/testing/test-cases/dylib-static-weak-link.dtest/missing.c
diff --git a/src/dyld-apple/testing/test-cases/dylib-static-weak-link.dtest/present.c b/src/dyld/testing/test-cases/dylib-static-weak-link.dtest/present.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/dylib-static-weak-link.dtest/present.c
rename to src/dyld/testing/test-cases/dylib-static-weak-link.dtest/present.c
diff --git a/src/dyld-apple/testing/test-cases/interpose-weak.dtest/foo.c b/src/dyld/testing/test-cases/interpose-weak.dtest/foo.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/interpose-weak.dtest/foo.c
rename to src/dyld/testing/test-cases/interpose-weak.dtest/foo.c
diff --git a/src/dyld-apple/testing/test-cases/interpose-weak.dtest/interposer.c b/src/dyld/testing/test-cases/interpose-weak.dtest/interposer.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/interpose-weak.dtest/interposer.c
rename to src/dyld/testing/test-cases/interpose-weak.dtest/interposer.c
diff --git a/src/dyld-apple/testing/test-cases/interpose-weak.dtest/main.c b/src/dyld/testing/test-cases/interpose-weak.dtest/main.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/interpose-weak.dtest/main.c
rename to src/dyld/testing/test-cases/interpose-weak.dtest/main.c
diff --git a/src/dyld-apple/testing/test-cases/restrict-search.dtest/foo.c b/src/dyld/testing/test-cases/restrict-search.dtest/foo.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/restrict-search.dtest/foo.c
rename to src/dyld/testing/test-cases/restrict-search.dtest/foo.c
diff --git a/src/dyld-apple/testing/test-cases/restrict-search.dtest/main.c b/src/dyld/testing/test-cases/restrict-search.dtest/main.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/restrict-search.dtest/main.c
rename to src/dyld/testing/test-cases/restrict-search.dtest/main.c
diff --git a/src/dyld-apple/testing/test-cases/thread-local-variables.dtest/foo.c b/src/dyld/testing/test-cases/thread-local-variables.dtest/foo.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/thread-local-variables.dtest/foo.c
rename to src/dyld/testing/test-cases/thread-local-variables.dtest/foo.c
diff --git a/src/dyld-apple/testing/test-cases/thread-local-variables.dtest/main.c b/src/dyld/testing/test-cases/thread-local-variables.dtest/main.c
similarity index 100%
rename from src/dyld-apple/testing/test-cases/thread-local-variables.dtest/main.c
rename to src/dyld/testing/test-cases/thread-local-variables.dtest/main.c
diff --git a/src/dyld-apple/unit-tests/bin/build-results-filter.pl b/src/dyld/unit-tests/bin/build-results-filter.pl
similarity index 100%
rename from src/dyld-apple/unit-tests/bin/build-results-filter.pl
rename to src/dyld/unit-tests/bin/build-results-filter.pl
diff --git a/src/dyld-apple/unit-tests/bin/exit-non-zero-pass.pl b/src/dyld/unit-tests/bin/exit-non-zero-pass.pl
similarity index 100%
rename from src/dyld-apple/unit-tests/bin/exit-non-zero-pass.pl
rename to src/dyld/unit-tests/bin/exit-non-zero-pass.pl
diff --git a/src/dyld-apple/unit-tests/bin/exit-zero-pass.pl b/src/dyld/unit-tests/bin/exit-zero-pass.pl
similarity index 100%
rename from src/dyld-apple/unit-tests/bin/exit-zero-pass.pl
rename to src/dyld/unit-tests/bin/exit-zero-pass.pl
diff --git a/src/dyld-apple/unit-tests/bin/fail-if-non-zero.pl b/src/dyld/unit-tests/bin/fail-if-non-zero.pl
similarity index 100%
rename from src/dyld-apple/unit-tests/bin/fail-if-non-zero.pl
rename to src/dyld/unit-tests/bin/fail-if-non-zero.pl
diff --git a/src/dyld-apple/unit-tests/bin/make-recursive.pl b/src/dyld/unit-tests/bin/make-recursive.pl
similarity index 100%
rename from src/dyld-apple/unit-tests/bin/make-recursive.pl
rename to src/dyld/unit-tests/bin/make-recursive.pl
diff --git a/src/dyld-apple/unit-tests/bin/pass-iff-exit-zero.pl b/src/dyld/unit-tests/bin/pass-iff-exit-zero.pl
similarity index 100%
rename from src/dyld-apple/unit-tests/bin/pass-iff-exit-zero.pl
rename to src/dyld/unit-tests/bin/pass-iff-exit-zero.pl
diff --git a/src/dyld-apple/unit-tests/bin/result-filter.pl b/src/dyld/unit-tests/bin/result-filter.pl
similarity index 100%
rename from src/dyld-apple/unit-tests/bin/result-filter.pl
rename to src/dyld/unit-tests/bin/result-filter.pl
diff --git a/src/dyld-apple/unit-tests/build-and-run-iPhoneOS-unit-tests b/src/dyld/unit-tests/build-and-run-iPhoneOS-unit-tests
similarity index 100%
rename from src/dyld-apple/unit-tests/build-and-run-iPhoneOS-unit-tests
rename to src/dyld/unit-tests/build-and-run-iPhoneOS-unit-tests
diff --git a/src/dyld-apple/unit-tests/build-iPhoneOS-unit-tests b/src/dyld/unit-tests/build-iPhoneOS-unit-tests
similarity index 100%
rename from src/dyld-apple/unit-tests/build-iPhoneOS-unit-tests
rename to src/dyld/unit-tests/build-iPhoneOS-unit-tests
diff --git a/src/dyld-apple/unit-tests/include/common.makefile b/src/dyld/unit-tests/include/common.makefile
similarity index 100%
rename from src/dyld-apple/unit-tests/include/common.makefile
rename to src/dyld/unit-tests/include/common.makefile
diff --git a/src/dyld-apple/unit-tests/include/test.h b/src/dyld/unit-tests/include/test.h
similarity index 100%
rename from src/dyld-apple/unit-tests/include/test.h
rename to src/dyld/unit-tests/include/test.h
diff --git a/src/dyld-apple/unit-tests/run-all-unit-tests b/src/dyld/unit-tests/run-all-unit-tests
similarity index 100%
rename from src/dyld-apple/unit-tests/run-all-unit-tests
rename to src/dyld/unit-tests/run-all-unit-tests
diff --git a/src/dyld-apple/unit-tests/test-cases/DYLD_LIBRARY_PATH-dyld_env/foo.c b/src/dyld/unit-tests/test-cases/DYLD_LIBRARY_PATH-dyld_env/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/DYLD_LIBRARY_PATH-dyld_env/foo.c
rename to src/dyld/unit-tests/test-cases/DYLD_LIBRARY_PATH-dyld_env/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/DYLD_LIBRARY_PATH-dyld_env/main.c b/src/dyld/unit-tests/test-cases/DYLD_LIBRARY_PATH-dyld_env/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/DYLD_LIBRARY_PATH-dyld_env/main.c
rename to src/dyld/unit-tests/test-cases/DYLD_LIBRARY_PATH-dyld_env/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_FRAMEWORK_PATH-basic/bar.c b/src/dyld/unit-tests/test-cases/DYLD_VERSIONED_FRAMEWORK_PATH-basic/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_FRAMEWORK_PATH-basic/bar.c
rename to src/dyld/unit-tests/test-cases/DYLD_VERSIONED_FRAMEWORK_PATH-basic/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_FRAMEWORK_PATH-basic/foo.c b/src/dyld/unit-tests/test-cases/DYLD_VERSIONED_FRAMEWORK_PATH-basic/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_FRAMEWORK_PATH-basic/foo.c
rename to src/dyld/unit-tests/test-cases/DYLD_VERSIONED_FRAMEWORK_PATH-basic/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_FRAMEWORK_PATH-basic/main.c b/src/dyld/unit-tests/test-cases/DYLD_VERSIONED_FRAMEWORK_PATH-basic/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_FRAMEWORK_PATH-basic/main.c
rename to src/dyld/unit-tests/test-cases/DYLD_VERSIONED_FRAMEWORK_PATH-basic/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-basic/bar.c b/src/dyld/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-basic/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-basic/bar.c
rename to src/dyld/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-basic/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-basic/foo.c b/src/dyld/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-basic/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-basic/foo.c
rename to src/dyld/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-basic/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-basic/main.c b/src/dyld/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-basic/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-basic/main.c
rename to src/dyld/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-basic/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-dyld_env-restrict/foo.c b/src/dyld/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-dyld_env-restrict/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-dyld_env-restrict/foo.c
rename to src/dyld/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-dyld_env-restrict/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-dyld_env-restrict/main.c b/src/dyld/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-dyld_env-restrict/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-dyld_env-restrict/main.c
rename to src/dyld/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-dyld_env-restrict/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-dyld_env/foo.c b/src/dyld/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-dyld_env/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-dyld_env/foo.c
rename to src/dyld/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-dyld_env/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-dyld_env/main.c b/src/dyld/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-dyld_env/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-dyld_env/main.c
rename to src/dyld/unit-tests/test-cases/DYLD_VERSIONED_LIBRARY_PATH-dyld_env/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/NSAddImage-MATCH_BY_INSTALLNAME/bar.c b/src/dyld/unit-tests/test-cases/NSAddImage-MATCH_BY_INSTALLNAME/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/NSAddImage-MATCH_BY_INSTALLNAME/bar.c
rename to src/dyld/unit-tests/test-cases/NSAddImage-MATCH_BY_INSTALLNAME/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/NSAddImage-MATCH_BY_INSTALLNAME/foo.c b/src/dyld/unit-tests/test-cases/NSAddImage-MATCH_BY_INSTALLNAME/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/NSAddImage-MATCH_BY_INSTALLNAME/foo.c
rename to src/dyld/unit-tests/test-cases/NSAddImage-MATCH_BY_INSTALLNAME/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/NSAddImage-MATCH_BY_INSTALLNAME/main.c b/src/dyld/unit-tests/test-cases/NSAddImage-MATCH_BY_INSTALLNAME/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/NSAddImage-MATCH_BY_INSTALLNAME/main.c
rename to src/dyld/unit-tests/test-cases/NSAddImage-MATCH_BY_INSTALLNAME/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/NSAddImage-RETURN_ONLY_IF_LOADED/main.c b/src/dyld/unit-tests/test-cases/NSAddImage-RETURN_ONLY_IF_LOADED/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/NSAddImage-RETURN_ONLY_IF_LOADED/main.c
rename to src/dyld/unit-tests/test-cases/NSAddImage-RETURN_ONLY_IF_LOADED/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/NSAddImage-leafname/main.c b/src/dyld/unit-tests/test-cases/NSAddImage-leafname/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/NSAddImage-leafname/main.c
rename to src/dyld/unit-tests/test-cases/NSAddImage-leafname/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/NSAddImage-leafname/zzz.c b/src/dyld/unit-tests/test-cases/NSAddImage-leafname/zzz.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/NSAddImage-leafname/zzz.c
rename to src/dyld/unit-tests/test-cases/NSAddImage-leafname/zzz.c
diff --git a/src/dyld-apple/unit-tests/test-cases/NSAddressOfSymbol-NULL/main.c b/src/dyld/unit-tests/test-cases/NSAddressOfSymbol-NULL/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/NSAddressOfSymbol-NULL/main.c
rename to src/dyld/unit-tests/test-cases/NSAddressOfSymbol-NULL/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/absolute-symbol/abs.s b/src/dyld/unit-tests/test-cases/absolute-symbol/abs.s
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/absolute-symbol/abs.s
rename to src/dyld/unit-tests/test-cases/absolute-symbol/abs.s
diff --git a/src/dyld-apple/unit-tests/test-cases/absolute-symbol/foo.c b/src/dyld/unit-tests/test-cases/absolute-symbol/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/absolute-symbol/foo.c
rename to src/dyld/unit-tests/test-cases/absolute-symbol/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/absolute-symbol/main.c b/src/dyld/unit-tests/test-cases/absolute-symbol/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/absolute-symbol/main.c
rename to src/dyld/unit-tests/test-cases/absolute-symbol/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/addend/foo.c b/src/dyld/unit-tests/test-cases/addend/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/addend/foo.c
rename to src/dyld/unit-tests/test-cases/addend/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/addend/main.c b/src/dyld/unit-tests/test-cases/addend/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/addend/main.c
rename to src/dyld/unit-tests/test-cases/addend/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/all_image_infos-cache-slide/main.c b/src/dyld/unit-tests/test-cases/all_image_infos-cache-slide/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/all_image_infos-cache-slide/main.c
rename to src/dyld/unit-tests/test-cases/all_image_infos-cache-slide/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/all_image_infos-duplicate/foo.c b/src/dyld/unit-tests/test-cases/all_image_infos-duplicate/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/all_image_infos-duplicate/foo.c
rename to src/dyld/unit-tests/test-cases/all_image_infos-duplicate/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/all_image_infos-duplicate/main.c b/src/dyld/unit-tests/test-cases/all_image_infos-duplicate/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/all_image_infos-duplicate/main.c
rename to src/dyld/unit-tests/test-cases/all_image_infos-duplicate/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/all_image_infos-paths/foo.c b/src/dyld/unit-tests/test-cases/all_image_infos-paths/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/all_image_infos-paths/foo.c
rename to src/dyld/unit-tests/test-cases/all_image_infos-paths/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/all_image_infos-paths/main.c b/src/dyld/unit-tests/test-cases/all_image_infos-paths/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/all_image_infos-paths/main.c
rename to src/dyld/unit-tests/test-cases/all_image_infos-paths/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/all_image_infos/foo.c b/src/dyld/unit-tests/test-cases/all_image_infos/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/all_image_infos/foo.c
rename to src/dyld/unit-tests/test-cases/all_image_infos/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/all_image_infos/main.c b/src/dyld/unit-tests/test-cases/all_image_infos/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/all_image_infos/main.c
rename to src/dyld/unit-tests/test-cases/all_image_infos/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/always-libSystem/main.c b/src/dyld/unit-tests/test-cases/always-libSystem/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/always-libSystem/main.c
rename to src/dyld/unit-tests/test-cases/always-libSystem/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/big-jump-table/foo.c b/src/dyld/unit-tests/test-cases/big-jump-table/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/big-jump-table/foo.c
rename to src/dyld/unit-tests/test-cases/big-jump-table/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/big-jump-table/foo.h b/src/dyld/unit-tests/test-cases/big-jump-table/foo.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/big-jump-table/foo.h
rename to src/dyld/unit-tests/test-cases/big-jump-table/foo.h
diff --git a/src/dyld-apple/unit-tests/test-cases/big-jump-table/funcs.c b/src/dyld/unit-tests/test-cases/big-jump-table/funcs.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/big-jump-table/funcs.c
rename to src/dyld/unit-tests/test-cases/big-jump-table/funcs.c
diff --git a/src/dyld-apple/unit-tests/test-cases/big-jump-table/main.c b/src/dyld/unit-tests/test-cases/big-jump-table/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/big-jump-table/main.c
rename to src/dyld/unit-tests/test-cases/big-jump-table/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/big-jump-table/pointers.c b/src/dyld/unit-tests/test-cases/big-jump-table/pointers.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/big-jump-table/pointers.c
rename to src/dyld/unit-tests/test-cases/big-jump-table/pointers.c
diff --git a/src/dyld-apple/unit-tests/test-cases/big-stack/main.c b/src/dyld/unit-tests/test-cases/big-stack/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/big-stack/main.c
rename to src/dyld/unit-tests/test-cases/big-stack/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/branch-islands/extra.c b/src/dyld/unit-tests/test-cases/branch-islands/extra.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/branch-islands/extra.c
rename to src/dyld/unit-tests/test-cases/branch-islands/extra.c
diff --git a/src/dyld-apple/unit-tests/test-cases/branch-islands/main.c b/src/dyld/unit-tests/test-cases/branch-islands/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/branch-islands/main.c
rename to src/dyld/unit-tests/test-cases/branch-islands/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/branch-islands/space.s b/src/dyld/unit-tests/test-cases/branch-islands/space.s
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/branch-islands/space.s
rename to src/dyld/unit-tests/test-cases/branch-islands/space.s
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-basic/bundle.c b/src/dyld/unit-tests/test-cases/bundle-basic/bundle.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-basic/bundle.c
rename to src/dyld/unit-tests/test-cases/bundle-basic/bundle.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-basic/main.c b/src/dyld/unit-tests/test-cases/bundle-basic/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-basic/main.c
rename to src/dyld/unit-tests/test-cases/bundle-basic/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-dont-gc/bar.c b/src/dyld/unit-tests/test-cases/bundle-dont-gc/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-dont-gc/bar.c
rename to src/dyld/unit-tests/test-cases/bundle-dont-gc/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-dont-gc/foo.c b/src/dyld/unit-tests/test-cases/bundle-dont-gc/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-dont-gc/foo.c
rename to src/dyld/unit-tests/test-cases/bundle-dont-gc/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-dont-gc/main.c b/src/dyld/unit-tests/test-cases/bundle-dont-gc/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-dont-gc/main.c
rename to src/dyld/unit-tests/test-cases/bundle-dont-gc/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-memory-load-all-infos/bundle.c b/src/dyld/unit-tests/test-cases/bundle-memory-load-all-infos/bundle.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-memory-load-all-infos/bundle.c
rename to src/dyld/unit-tests/test-cases/bundle-memory-load-all-infos/bundle.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-memory-load-all-infos/main.c b/src/dyld/unit-tests/test-cases/bundle-memory-load-all-infos/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-memory-load-all-infos/main.c
rename to src/dyld/unit-tests/test-cases/bundle-memory-load-all-infos/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-memory-load-bad/bundle.c b/src/dyld/unit-tests/test-cases/bundle-memory-load-bad/bundle.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-memory-load-bad/bundle.c
rename to src/dyld/unit-tests/test-cases/bundle-memory-load-bad/bundle.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-memory-load-bad/main.c b/src/dyld/unit-tests/test-cases/bundle-memory-load-bad/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-memory-load-bad/main.c
rename to src/dyld/unit-tests/test-cases/bundle-memory-load-bad/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-memory-load-fat/bundle.c b/src/dyld/unit-tests/test-cases/bundle-memory-load-fat/bundle.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-memory-load-fat/bundle.c
rename to src/dyld/unit-tests/test-cases/bundle-memory-load-fat/bundle.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-memory-load-fat/main.c b/src/dyld/unit-tests/test-cases/bundle-memory-load-fat/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-memory-load-fat/main.c
rename to src/dyld/unit-tests/test-cases/bundle-memory-load-fat/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-memory-load-malloc/bundle.c b/src/dyld/unit-tests/test-cases/bundle-memory-load-malloc/bundle.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-memory-load-malloc/bundle.c
rename to src/dyld/unit-tests/test-cases/bundle-memory-load-malloc/bundle.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-memory-load-malloc/main.c b/src/dyld/unit-tests/test-cases/bundle-memory-load-malloc/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-memory-load-malloc/main.c
rename to src/dyld/unit-tests/test-cases/bundle-memory-load-malloc/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-memory-load/bundle.c b/src/dyld/unit-tests/test-cases/bundle-memory-load/bundle.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-memory-load/bundle.c
rename to src/dyld/unit-tests/test-cases/bundle-memory-load/bundle.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-memory-load/main.c b/src/dyld/unit-tests/test-cases/bundle-memory-load/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-memory-load/main.c
rename to src/dyld/unit-tests/test-cases/bundle-memory-load/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-multi-link/bundle.c b/src/dyld/unit-tests/test-cases/bundle-multi-link/bundle.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-multi-link/bundle.c
rename to src/dyld/unit-tests/test-cases/bundle-multi-link/bundle.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-multi-link/main.c b/src/dyld/unit-tests/test-cases/bundle-multi-link/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-multi-link/main.c
rename to src/dyld/unit-tests/test-cases/bundle-multi-link/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-multi-load/bundle.c b/src/dyld/unit-tests/test-cases/bundle-multi-load/bundle.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-multi-load/bundle.c
rename to src/dyld/unit-tests/test-cases/bundle-multi-load/bundle.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-multi-load/main.c b/src/dyld/unit-tests/test-cases/bundle-multi-load/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-multi-load/main.c
rename to src/dyld/unit-tests/test-cases/bundle-multi-load/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-name-ownership/bundle.c b/src/dyld/unit-tests/test-cases/bundle-name-ownership/bundle.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-name-ownership/bundle.c
rename to src/dyld/unit-tests/test-cases/bundle-name-ownership/bundle.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-name-ownership/main.c b/src/dyld/unit-tests/test-cases/bundle-name-ownership/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-name-ownership/main.c
rename to src/dyld/unit-tests/test-cases/bundle-name-ownership/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-private/bundle.c b/src/dyld/unit-tests/test-cases/bundle-private/bundle.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-private/bundle.c
rename to src/dyld/unit-tests/test-cases/bundle-private/bundle.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-private/main.c b/src/dyld/unit-tests/test-cases/bundle-private/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-private/main.c
rename to src/dyld/unit-tests/test-cases/bundle-private/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-reload/bundle.cxx b/src/dyld/unit-tests/test-cases/bundle-reload/bundle.cxx
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-reload/bundle.cxx
rename to src/dyld/unit-tests/test-cases/bundle-reload/bundle.cxx
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-reload/main.c b/src/dyld/unit-tests/test-cases/bundle-reload/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-reload/main.c
rename to src/dyld/unit-tests/test-cases/bundle-reload/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-terminator/bundle.cxx b/src/dyld/unit-tests/test-cases/bundle-terminator/bundle.cxx
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-terminator/bundle.cxx
rename to src/dyld/unit-tests/test-cases/bundle-terminator/bundle.cxx
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-terminator/main.c b/src/dyld/unit-tests/test-cases/bundle-terminator/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-terminator/main.c
rename to src/dyld/unit-tests/test-cases/bundle-terminator/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-unlinkable/bundle.c b/src/dyld/unit-tests/test-cases/bundle-unlinkable/bundle.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-unlinkable/bundle.c
rename to src/dyld/unit-tests/test-cases/bundle-unlinkable/bundle.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-unlinkable/lib.c b/src/dyld/unit-tests/test-cases/bundle-unlinkable/lib.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-unlinkable/lib.c
rename to src/dyld/unit-tests/test-cases/bundle-unlinkable/lib.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-unlinkable/main.c b/src/dyld/unit-tests/test-cases/bundle-unlinkable/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-unlinkable/main.c
rename to src/dyld/unit-tests/test-cases/bundle-unlinkable/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-unload-keep-mapped/bundle.c b/src/dyld/unit-tests/test-cases/bundle-unload-keep-mapped/bundle.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-unload-keep-mapped/bundle.c
rename to src/dyld/unit-tests/test-cases/bundle-unload-keep-mapped/bundle.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-unload-keep-mapped/main.c b/src/dyld/unit-tests/test-cases/bundle-unload-keep-mapped/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-unload-keep-mapped/main.c
rename to src/dyld/unit-tests/test-cases/bundle-unload-keep-mapped/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-v-dylib/bar.c b/src/dyld/unit-tests/test-cases/bundle-v-dylib/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-v-dylib/bar.c
rename to src/dyld/unit-tests/test-cases/bundle-v-dylib/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-v-dylib/foo.c b/src/dyld/unit-tests/test-cases/bundle-v-dylib/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-v-dylib/foo.c
rename to src/dyld/unit-tests/test-cases/bundle-v-dylib/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-v-dylib/main.c b/src/dyld/unit-tests/test-cases/bundle-v-dylib/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-v-dylib/main.c
rename to src/dyld/unit-tests/test-cases/bundle-v-dylib/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-weak/bundle.cxx b/src/dyld/unit-tests/test-cases/bundle-weak/bundle.cxx
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-weak/bundle.cxx
rename to src/dyld/unit-tests/test-cases/bundle-weak/bundle.cxx
diff --git a/src/dyld-apple/unit-tests/test-cases/bundle-weak/main.c b/src/dyld/unit-tests/test-cases/bundle-weak/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/bundle-weak/main.c
rename to src/dyld/unit-tests/test-cases/bundle-weak/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/concurrent-dlopen-initializers/foo.c b/src/dyld/unit-tests/test-cases/concurrent-dlopen-initializers/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/concurrent-dlopen-initializers/foo.c
rename to src/dyld/unit-tests/test-cases/concurrent-dlopen-initializers/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/concurrent-dlopen-initializers/main.c b/src/dyld/unit-tests/test-cases/concurrent-dlopen-initializers/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/concurrent-dlopen-initializers/main.c
rename to src/dyld/unit-tests/test-cases/concurrent-dlopen-initializers/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/coreSymbolication-notify/bar.c b/src/dyld/unit-tests/test-cases/coreSymbolication-notify/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/coreSymbolication-notify/bar.c
rename to src/dyld/unit-tests/test-cases/coreSymbolication-notify/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/coreSymbolication-notify/foo.c b/src/dyld/unit-tests/test-cases/coreSymbolication-notify/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/coreSymbolication-notify/foo.c
rename to src/dyld/unit-tests/test-cases/coreSymbolication-notify/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/coreSymbolication-notify/main.c b/src/dyld/unit-tests/test-cases/coreSymbolication-notify/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/coreSymbolication-notify/main.c
rename to src/dyld/unit-tests/test-cases/coreSymbolication-notify/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/crt-apple/main.c b/src/dyld/unit-tests/test-cases/crt-apple/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/crt-apple/main.c
rename to src/dyld/unit-tests/test-cases/crt-apple/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/crt-argv-NULL/main.c b/src/dyld/unit-tests/test-cases/crt-argv-NULL/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/crt-argv-NULL/main.c
rename to src/dyld/unit-tests/test-cases/crt-argv-NULL/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/crt-custom/main.c b/src/dyld/unit-tests/test-cases/crt-custom/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/crt-custom/main.c
rename to src/dyld/unit-tests/test-cases/crt-custom/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/crt-custom/mystart.s b/src/dyld/unit-tests/test-cases/crt-custom/mystart.s
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/crt-custom/mystart.s
rename to src/dyld/unit-tests/test-cases/crt-custom/mystart.s
diff --git a/src/dyld-apple/unit-tests/test-cases/crt-libSystem/main.c b/src/dyld/unit-tests/test-cases/crt-libSystem/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/crt-libSystem/main.c
rename to src/dyld/unit-tests/test-cases/crt-libSystem/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/crt-result/bad.c b/src/dyld/unit-tests/test-cases/crt-result/bad.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/crt-result/bad.c
rename to src/dyld/unit-tests/test-cases/crt-result/bad.c
diff --git a/src/dyld-apple/unit-tests/test-cases/crt-result/good.c b/src/dyld/unit-tests/test-cases/crt-result/good.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/crt-result/good.c
rename to src/dyld/unit-tests/test-cases/crt-result/good.c
diff --git a/src/dyld-apple/unit-tests/test-cases/cxa_finalize/foo.cxx b/src/dyld/unit-tests/test-cases/cxa_finalize/foo.cxx
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/cxa_finalize/foo.cxx
rename to src/dyld/unit-tests/test-cases/cxa_finalize/foo.cxx
diff --git a/src/dyld-apple/unit-tests/test-cases/cxa_finalize/main.c b/src/dyld/unit-tests/test-cases/cxa_finalize/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/cxa_finalize/main.c
rename to src/dyld/unit-tests/test-cases/cxa_finalize/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/deadlock/bar.c b/src/dyld/unit-tests/test-cases/deadlock/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/deadlock/bar.c
rename to src/dyld/unit-tests/test-cases/deadlock/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/deadlock/foo.c b/src/dyld/unit-tests/test-cases/deadlock/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/deadlock/foo.c
rename to src/dyld/unit-tests/test-cases/deadlock/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/deadlock/main.c b/src/dyld/unit-tests/test-cases/deadlock/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/deadlock/main.c
rename to src/dyld/unit-tests/test-cases/deadlock/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dladdr-stripped/main.c b/src/dyld/unit-tests/test-cases/dladdr-stripped/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dladdr-stripped/main.c
rename to src/dyld/unit-tests/test-cases/dladdr-stripped/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dladdr/main.c b/src/dyld/unit-tests/test-cases/dladdr/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dladdr/main.c
rename to src/dyld/unit-tests/test-cases/dladdr/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-basic/foo.c b/src/dyld/unit-tests/test-cases/dlclose-basic/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-basic/foo.c
rename to src/dyld/unit-tests/test-cases/dlclose-basic/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-basic/main.c b/src/dyld/unit-tests/test-cases/dlclose-basic/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-basic/main.c
rename to src/dyld/unit-tests/test-cases/dlclose-basic/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-bundle-unload/foo.c b/src/dyld/unit-tests/test-cases/dlclose-bundle-unload/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-bundle-unload/foo.c
rename to src/dyld/unit-tests/test-cases/dlclose-bundle-unload/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-bundle-unload/main.c b/src/dyld/unit-tests/test-cases/dlclose-bundle-unload/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-bundle-unload/main.c
rename to src/dyld/unit-tests/test-cases/dlclose-bundle-unload/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-dylib-dynamic-ref/bar.c b/src/dyld/unit-tests/test-cases/dlclose-dylib-dynamic-ref/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-dylib-dynamic-ref/bar.c
rename to src/dyld/unit-tests/test-cases/dlclose-dylib-dynamic-ref/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-dylib-dynamic-ref/baz.c b/src/dyld/unit-tests/test-cases/dlclose-dylib-dynamic-ref/baz.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-dylib-dynamic-ref/baz.c
rename to src/dyld/unit-tests/test-cases/dlclose-dylib-dynamic-ref/baz.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-dylib-dynamic-ref/foo.c b/src/dyld/unit-tests/test-cases/dlclose-dylib-dynamic-ref/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-dylib-dynamic-ref/foo.c
rename to src/dyld/unit-tests/test-cases/dlclose-dylib-dynamic-ref/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-dylib-dynamic-ref/main.c b/src/dyld/unit-tests/test-cases/dlclose-dylib-dynamic-ref/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-dylib-dynamic-ref/main.c
rename to src/dyld/unit-tests/test-cases/dlclose-dylib-dynamic-ref/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-dylib-ref-count/bar.c b/src/dyld/unit-tests/test-cases/dlclose-dylib-ref-count/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-dylib-ref-count/bar.c
rename to src/dyld/unit-tests/test-cases/dlclose-dylib-ref-count/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-dylib-ref-count/base.c b/src/dyld/unit-tests/test-cases/dlclose-dylib-ref-count/base.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-dylib-ref-count/base.c
rename to src/dyld/unit-tests/test-cases/dlclose-dylib-ref-count/base.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-dylib-ref-count/foo.c b/src/dyld/unit-tests/test-cases/dlclose-dylib-ref-count/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-dylib-ref-count/foo.c
rename to src/dyld/unit-tests/test-cases/dlclose-dylib-ref-count/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-dylib-ref-count/main.c b/src/dyld/unit-tests/test-cases/dlclose-dylib-ref-count/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-dylib-ref-count/main.c
rename to src/dyld/unit-tests/test-cases/dlclose-dylib-ref-count/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-dylib-terminators/bar.cpp b/src/dyld/unit-tests/test-cases/dlclose-dylib-terminators/bar.cpp
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-dylib-terminators/bar.cpp
rename to src/dyld/unit-tests/test-cases/dlclose-dylib-terminators/bar.cpp
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-dylib-terminators/baz.c b/src/dyld/unit-tests/test-cases/dlclose-dylib-terminators/baz.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-dylib-terminators/baz.c
rename to src/dyld/unit-tests/test-cases/dlclose-dylib-terminators/baz.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-dylib-terminators/foo.cpp b/src/dyld/unit-tests/test-cases/dlclose-dylib-terminators/foo.cpp
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-dylib-terminators/foo.cpp
rename to src/dyld/unit-tests/test-cases/dlclose-dylib-terminators/foo.cpp
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-dylib-terminators/main.c b/src/dyld/unit-tests/test-cases/dlclose-dylib-terminators/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-dylib-terminators/main.c
rename to src/dyld/unit-tests/test-cases/dlclose-dylib-terminators/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-dylib-unload/bar.c b/src/dyld/unit-tests/test-cases/dlclose-dylib-unload/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-dylib-unload/bar.c
rename to src/dyld/unit-tests/test-cases/dlclose-dylib-unload/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-dylib-unload/foo.c b/src/dyld/unit-tests/test-cases/dlclose-dylib-unload/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-dylib-unload/foo.c
rename to src/dyld/unit-tests/test-cases/dlclose-dylib-unload/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-dylib-unload/main.c b/src/dyld/unit-tests/test-cases/dlclose-dylib-unload/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-dylib-unload/main.c
rename to src/dyld/unit-tests/test-cases/dlclose-dylib-unload/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-order/bar.cxx b/src/dyld/unit-tests/test-cases/dlclose-order/bar.cxx
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-order/bar.cxx
rename to src/dyld/unit-tests/test-cases/dlclose-order/bar.cxx
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-order/base.c b/src/dyld/unit-tests/test-cases/dlclose-order/base.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-order/base.c
rename to src/dyld/unit-tests/test-cases/dlclose-order/base.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-order/base.h b/src/dyld/unit-tests/test-cases/dlclose-order/base.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-order/base.h
rename to src/dyld/unit-tests/test-cases/dlclose-order/base.h
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-order/baz.cxx b/src/dyld/unit-tests/test-cases/dlclose-order/baz.cxx
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-order/baz.cxx
rename to src/dyld/unit-tests/test-cases/dlclose-order/baz.cxx
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-order/foo.c b/src/dyld/unit-tests/test-cases/dlclose-order/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-order/foo.c
rename to src/dyld/unit-tests/test-cases/dlclose-order/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-order/main.c b/src/dyld/unit-tests/test-cases/dlclose-order/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-order/main.c
rename to src/dyld/unit-tests/test-cases/dlclose-order/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-terminator-dlclose/bar.c b/src/dyld/unit-tests/test-cases/dlclose-terminator-dlclose/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-terminator-dlclose/bar.c
rename to src/dyld/unit-tests/test-cases/dlclose-terminator-dlclose/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-terminator-dlclose/foo.c b/src/dyld/unit-tests/test-cases/dlclose-terminator-dlclose/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-terminator-dlclose/foo.c
rename to src/dyld/unit-tests/test-cases/dlclose-terminator-dlclose/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-terminator-dlclose/main.c b/src/dyld/unit-tests/test-cases/dlclose-terminator-dlclose/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-terminator-dlclose/main.c
rename to src/dyld/unit-tests/test-cases/dlclose-terminator-dlclose/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-unload-c++/bar.c b/src/dyld/unit-tests/test-cases/dlclose-unload-c++/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-unload-c++/bar.c
rename to src/dyld/unit-tests/test-cases/dlclose-unload-c++/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-unload-c++/foo.c b/src/dyld/unit-tests/test-cases/dlclose-unload-c++/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-unload-c++/foo.c
rename to src/dyld/unit-tests/test-cases/dlclose-unload-c++/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-unload-c++/main.c b/src/dyld/unit-tests/test-cases/dlclose-unload-c++/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-unload-c++/main.c
rename to src/dyld/unit-tests/test-cases/dlclose-unload-c++/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-unmap/foo.c b/src/dyld/unit-tests/test-cases/dlclose-unmap/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-unmap/foo.c
rename to src/dyld/unit-tests/test-cases/dlclose-unmap/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlclose-unmap/main.c b/src/dyld/unit-tests/test-cases/dlclose-unmap/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlclose-unmap/main.c
rename to src/dyld/unit-tests/test-cases/dlclose-unmap/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlerror-clear/main.c b/src/dyld/unit-tests/test-cases/dlerror-clear/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlerror-clear/main.c
rename to src/dyld/unit-tests/test-cases/dlerror-clear/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlerror/main.c b/src/dyld/unit-tests/test-cases/dlerror/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlerror/main.c
rename to src/dyld/unit-tests/test-cases/dlerror/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-DYLD_FALLBACK_LIBRARY_PATH/foo.c b/src/dyld/unit-tests/test-cases/dlopen-DYLD_FALLBACK_LIBRARY_PATH/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-DYLD_FALLBACK_LIBRARY_PATH/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-DYLD_FALLBACK_LIBRARY_PATH/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-DYLD_FALLBACK_LIBRARY_PATH/main.c b/src/dyld/unit-tests/test-cases/dlopen-DYLD_FALLBACK_LIBRARY_PATH/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-DYLD_FALLBACK_LIBRARY_PATH/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-DYLD_FALLBACK_LIBRARY_PATH/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-DYLD_LIBRARY_PATH/foo.c b/src/dyld/unit-tests/test-cases/dlopen-DYLD_LIBRARY_PATH/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-DYLD_LIBRARY_PATH/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-DYLD_LIBRARY_PATH/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-DYLD_LIBRARY_PATH/main.c b/src/dyld/unit-tests/test-cases/dlopen-DYLD_LIBRARY_PATH/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-DYLD_LIBRARY_PATH/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-DYLD_LIBRARY_PATH/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-LD_LIBRARY_PATH/foo.c b/src/dyld/unit-tests/test-cases/dlopen-LD_LIBRARY_PATH/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-LD_LIBRARY_PATH/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-LD_LIBRARY_PATH/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-LD_LIBRARY_PATH/main.c b/src/dyld/unit-tests/test-cases/dlopen-LD_LIBRARY_PATH/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-LD_LIBRARY_PATH/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-LD_LIBRARY_PATH/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-NULL-RTLD_FIRST/foo.c b/src/dyld/unit-tests/test-cases/dlopen-NULL-RTLD_FIRST/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-NULL-RTLD_FIRST/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-NULL-RTLD_FIRST/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-NULL-RTLD_FIRST/main.c b/src/dyld/unit-tests/test-cases/dlopen-NULL-RTLD_FIRST/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-NULL-RTLD_FIRST/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-NULL-RTLD_FIRST/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_FIRST/bar.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_FIRST/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_FIRST/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_FIRST/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_FIRST/base.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_FIRST/base.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_FIRST/base.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_FIRST/base.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_FIRST/foo.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_FIRST/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_FIRST/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_FIRST/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_FIRST/main.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_FIRST/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_FIRST/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_FIRST/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_GLOBAL/bar.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_GLOBAL/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_GLOBAL/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_GLOBAL/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_GLOBAL/foo.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_GLOBAL/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_GLOBAL/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_GLOBAL/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_GLOBAL/main.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_GLOBAL/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_GLOBAL/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_GLOBAL/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL-ignore/bar.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL-ignore/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL-ignore/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL-ignore/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL-ignore/foo.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL-ignore/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL-ignore/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL-ignore/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL-ignore/main.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL-ignore/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL-ignore/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL-ignore/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL-weak/bar.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL-weak/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL-weak/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL-weak/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL-weak/foo.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL-weak/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL-weak/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL-weak/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL-weak/main.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL-weak/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL-weak/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL-weak/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL/bar.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL/foo.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL/main.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_LOCAL/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_LOCAL/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NODELETE/foo.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NODELETE/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NODELETE/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NODELETE/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NODELETE/main.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NODELETE/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NODELETE/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NODELETE/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-fallback/foo.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-fallback/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-fallback/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-fallback/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-fallback/main.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-fallback/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-fallback/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-fallback/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/bar.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/base.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/base.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/base.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/base.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/baz.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/baz.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/baz.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/baz.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/foo.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/main.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-in-initializer/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-symlink/bar.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-symlink/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-symlink/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-symlink/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-symlink/foo.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-symlink/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-symlink/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-symlink/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-symlink/main.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-symlink/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD-symlink/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD-symlink/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD/foo.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD/main.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOLOAD/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NOLOAD/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOW/bundle.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NOW/bundle.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOW/bundle.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NOW/bundle.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOW/foo.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NOW/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOW/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NOW/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOW/main.c b/src/dyld/unit-tests/test-cases/dlopen-RTLD_NOW/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-RTLD_NOW/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-RTLD_NOW/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-basic/foo.c b/src/dyld/unit-tests/test-cases/dlopen-basic/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-basic/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-basic/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-basic/main.c b/src/dyld/unit-tests/test-cases/dlopen-basic/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-basic/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-basic/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-codesign-dynamic/foo.c b/src/dyld/unit-tests/test-cases/dlopen-codesign-dynamic/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-codesign-dynamic/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-codesign-dynamic/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-codesign-dynamic/main.c b/src/dyld/unit-tests/test-cases/dlopen-codesign-dynamic/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-codesign-dynamic/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-codesign-dynamic/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-codesign/foo.c b/src/dyld/unit-tests/test-cases/dlopen-codesign/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-codesign/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-codesign/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-codesign/main.c b/src/dyld/unit-tests/test-cases/dlopen-codesign/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-codesign/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-codesign/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-dyld-locking/bar.c b/src/dyld/unit-tests/test-cases/dlopen-dyld-locking/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-dyld-locking/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen-dyld-locking/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-dyld-locking/base.c b/src/dyld/unit-tests/test-cases/dlopen-dyld-locking/base.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-dyld-locking/base.c
rename to src/dyld/unit-tests/test-cases/dlopen-dyld-locking/base.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-dyld-locking/base.h b/src/dyld/unit-tests/test-cases/dlopen-dyld-locking/base.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-dyld-locking/base.h
rename to src/dyld/unit-tests/test-cases/dlopen-dyld-locking/base.h
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-dyld-locking/foo.c b/src/dyld/unit-tests/test-cases/dlopen-dyld-locking/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-dyld-locking/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-dyld-locking/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-dyld-locking/main.c b/src/dyld/unit-tests/test-cases/dlopen-dyld-locking/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-dyld-locking/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-dyld-locking/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-error/foo.c b/src/dyld/unit-tests/test-cases/dlopen-error/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-error/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-error/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-error/main.c b/src/dyld/unit-tests/test-cases/dlopen-error/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-error/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-error/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-executable/foo.c b/src/dyld/unit-tests/test-cases/dlopen-executable/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-executable/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-executable/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-executable/main.c b/src/dyld/unit-tests/test-cases/dlopen-executable/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-executable/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-executable/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-from-anonymous-code/foo.c b/src/dyld/unit-tests/test-cases/dlopen-from-anonymous-code/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-from-anonymous-code/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-from-anonymous-code/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-from-anonymous-code/main.c b/src/dyld/unit-tests/test-cases/dlopen-from-anonymous-code/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-from-anonymous-code/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-from-anonymous-code/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-in-initializer/foo.c b/src/dyld/unit-tests/test-cases/dlopen-in-initializer/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-in-initializer/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-in-initializer/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-in-initializer/main.c b/src/dyld/unit-tests/test-cases/dlopen-in-initializer/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-in-initializer/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-in-initializer/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen-notify/bar.c b/src/dyld/unit-tests/test-cases/dlopen-init-dlopen-notify/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen-notify/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen-init-dlopen-notify/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen-notify/foo.c b/src/dyld/unit-tests/test-cases/dlopen-init-dlopen-notify/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen-notify/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-init-dlopen-notify/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen-notify/foo1.c b/src/dyld/unit-tests/test-cases/dlopen-init-dlopen-notify/foo1.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen-notify/foo1.c
rename to src/dyld/unit-tests/test-cases/dlopen-init-dlopen-notify/foo1.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen-notify/foo2.c b/src/dyld/unit-tests/test-cases/dlopen-init-dlopen-notify/foo2.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen-notify/foo2.c
rename to src/dyld/unit-tests/test-cases/dlopen-init-dlopen-notify/foo2.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen-notify/main.cxx b/src/dyld/unit-tests/test-cases/dlopen-init-dlopen-notify/main.cxx
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen-notify/main.cxx
rename to src/dyld/unit-tests/test-cases/dlopen-init-dlopen-notify/main.cxx
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen-up/bar.c b/src/dyld/unit-tests/test-cases/dlopen-init-dlopen-up/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen-up/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen-init-dlopen-up/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen-up/foo.c b/src/dyld/unit-tests/test-cases/dlopen-init-dlopen-up/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen-up/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-init-dlopen-up/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen-up/main.c b/src/dyld/unit-tests/test-cases/dlopen-init-dlopen-up/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen-up/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-init-dlopen-up/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen/bar.c b/src/dyld/unit-tests/test-cases/dlopen-init-dlopen/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen-init-dlopen/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen/foo.c b/src/dyld/unit-tests/test-cases/dlopen-init-dlopen/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-init-dlopen/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen/main.c b/src/dyld/unit-tests/test-cases/dlopen-init-dlopen/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-init-dlopen/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-init-dlopen/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-init-up/bar.c b/src/dyld/unit-tests/test-cases/dlopen-init-up/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-init-up/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen-init-up/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-init-up/foo.c b/src/dyld/unit-tests/test-cases/dlopen-init-up/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-init-up/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-init-up/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-init-up/main.c b/src/dyld/unit-tests/test-cases/dlopen-init-up/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-init-up/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-init-up/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-initializer/bar.c b/src/dyld/unit-tests/test-cases/dlopen-initializer/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-initializer/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen-initializer/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-initializer/foo.c b/src/dyld/unit-tests/test-cases/dlopen-initializer/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-initializer/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-initializer/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-initializer/main.c b/src/dyld/unit-tests/test-cases/dlopen-initializer/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-initializer/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-initializer/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-leak-threaded/main.c b/src/dyld/unit-tests/test-cases/dlopen-leak-threaded/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-leak-threaded/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-leak-threaded/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-leak/bar.c b/src/dyld/unit-tests/test-cases/dlopen-leak/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-leak/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen-leak/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-leak/foo.c b/src/dyld/unit-tests/test-cases/dlopen-leak/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-leak/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-leak/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-leak/main.c b/src/dyld/unit-tests/test-cases/dlopen-leak/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-leak/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-leak/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-local-and-global/bar.c b/src/dyld/unit-tests/test-cases/dlopen-local-and-global/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-local-and-global/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen-local-and-global/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-local-and-global/foo.c b/src/dyld/unit-tests/test-cases/dlopen-local-and-global/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-local-and-global/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-local-and-global/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-local-and-global/main.c b/src/dyld/unit-tests/test-cases/dlopen-local-and-global/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-local-and-global/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-local-and-global/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-multi/foo.c b/src/dyld/unit-tests/test-cases/dlopen-multi/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-multi/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-multi/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-multi/main.c b/src/dyld/unit-tests/test-cases/dlopen-multi/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-multi/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-multi/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-non-canonical-path/main.c b/src/dyld/unit-tests/test-cases/dlopen-non-canonical-path/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-non-canonical-path/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-non-canonical-path/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-notify-bind/foo.c b/src/dyld/unit-tests/test-cases/dlopen-notify-bind/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-notify-bind/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-notify-bind/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-notify-bind/main.c b/src/dyld/unit-tests/test-cases/dlopen-notify-bind/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-notify-bind/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-notify-bind/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-sandbox/base.sb b/src/dyld/unit-tests/test-cases/dlopen-sandbox/base.sb
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-sandbox/base.sb
rename to src/dyld/unit-tests/test-cases/dlopen-sandbox/base.sb
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-sandbox/foo.c b/src/dyld/unit-tests/test-cases/dlopen-sandbox/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-sandbox/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-sandbox/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-sandbox/main.c b/src/dyld/unit-tests/test-cases/dlopen-sandbox/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-sandbox/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-sandbox/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-search-leak/foo.c b/src/dyld/unit-tests/test-cases/dlopen-search-leak/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-search-leak/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen-search-leak/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-search-leak/main.c b/src/dyld/unit-tests/test-cases/dlopen-search-leak/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-search-leak/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-search-leak/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen-zero/main.c b/src/dyld/unit-tests/test-cases/dlopen-zero/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen-zero/main.c
rename to src/dyld/unit-tests/test-cases/dlopen-zero/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen_preflight-basic/bar.c b/src/dyld/unit-tests/test-cases/dlopen_preflight-basic/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen_preflight-basic/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen_preflight-basic/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen_preflight-basic/foo.c b/src/dyld/unit-tests/test-cases/dlopen_preflight-basic/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen_preflight-basic/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen_preflight-basic/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen_preflight-basic/main.c b/src/dyld/unit-tests/test-cases/dlopen_preflight-basic/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen_preflight-basic/main.c
rename to src/dyld/unit-tests/test-cases/dlopen_preflight-basic/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen_preflight-cycle/bar.c b/src/dyld/unit-tests/test-cases/dlopen_preflight-cycle/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen_preflight-cycle/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen_preflight-cycle/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen_preflight-cycle/baz.c b/src/dyld/unit-tests/test-cases/dlopen_preflight-cycle/baz.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen_preflight-cycle/baz.c
rename to src/dyld/unit-tests/test-cases/dlopen_preflight-cycle/baz.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen_preflight-cycle/foo.c b/src/dyld/unit-tests/test-cases/dlopen_preflight-cycle/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen_preflight-cycle/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen_preflight-cycle/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen_preflight-cycle/main.c b/src/dyld/unit-tests/test-cases/dlopen_preflight-cycle/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen_preflight-cycle/main.c
rename to src/dyld/unit-tests/test-cases/dlopen_preflight-cycle/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen_preflight-leak-image-deny-single/foo.c b/src/dyld/unit-tests/test-cases/dlopen_preflight-leak-image-deny-single/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen_preflight-leak-image-deny-single/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen_preflight-leak-image-deny-single/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen_preflight-leak-image-deny-single/main.c b/src/dyld/unit-tests/test-cases/dlopen_preflight-leak-image-deny-single/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen_preflight-leak-image-deny-single/main.c
rename to src/dyld/unit-tests/test-cases/dlopen_preflight-leak-image-deny-single/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen_preflight-leak/bar.c b/src/dyld/unit-tests/test-cases/dlopen_preflight-leak/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen_preflight-leak/bar.c
rename to src/dyld/unit-tests/test-cases/dlopen_preflight-leak/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen_preflight-leak/foo.c b/src/dyld/unit-tests/test-cases/dlopen_preflight-leak/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen_preflight-leak/foo.c
rename to src/dyld/unit-tests/test-cases/dlopen_preflight-leak/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlopen_preflight-leak/main.c b/src/dyld/unit-tests/test-cases/dlopen_preflight-leak/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlopen_preflight-leak/main.c
rename to src/dyld/unit-tests/test-cases/dlopen_preflight-leak/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_DEFAULT/foo.c b/src/dyld/unit-tests/test-cases/dlsym-RTLD_DEFAULT/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_DEFAULT/foo.c
rename to src/dyld/unit-tests/test-cases/dlsym-RTLD_DEFAULT/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_DEFAULT/main.c b/src/dyld/unit-tests/test-cases/dlsym-RTLD_DEFAULT/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_DEFAULT/main.c
rename to src/dyld/unit-tests/test-cases/dlsym-RTLD_DEFAULT/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_MAIN_ONLY/foo.c b/src/dyld/unit-tests/test-cases/dlsym-RTLD_MAIN_ONLY/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_MAIN_ONLY/foo.c
rename to src/dyld/unit-tests/test-cases/dlsym-RTLD_MAIN_ONLY/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_MAIN_ONLY/main.c b/src/dyld/unit-tests/test-cases/dlsym-RTLD_MAIN_ONLY/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_MAIN_ONLY/main.c
rename to src/dyld/unit-tests/test-cases/dlsym-RTLD_MAIN_ONLY/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_NEXT-missing/foo1.c b/src/dyld/unit-tests/test-cases/dlsym-RTLD_NEXT-missing/foo1.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_NEXT-missing/foo1.c
rename to src/dyld/unit-tests/test-cases/dlsym-RTLD_NEXT-missing/foo1.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_NEXT-missing/foo2.c b/src/dyld/unit-tests/test-cases/dlsym-RTLD_NEXT-missing/foo2.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_NEXT-missing/foo2.c
rename to src/dyld/unit-tests/test-cases/dlsym-RTLD_NEXT-missing/foo2.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_NEXT-missing/foo3.c b/src/dyld/unit-tests/test-cases/dlsym-RTLD_NEXT-missing/foo3.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_NEXT-missing/foo3.c
rename to src/dyld/unit-tests/test-cases/dlsym-RTLD_NEXT-missing/foo3.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_NEXT-missing/main.c b/src/dyld/unit-tests/test-cases/dlsym-RTLD_NEXT-missing/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_NEXT-missing/main.c
rename to src/dyld/unit-tests/test-cases/dlsym-RTLD_NEXT-missing/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_NEXT/foo.c b/src/dyld/unit-tests/test-cases/dlsym-RTLD_NEXT/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_NEXT/foo.c
rename to src/dyld/unit-tests/test-cases/dlsym-RTLD_NEXT/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_NEXT/main.c b/src/dyld/unit-tests/test-cases/dlsym-RTLD_NEXT/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_NEXT/main.c
rename to src/dyld/unit-tests/test-cases/dlsym-RTLD_NEXT/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_NEXT/test.c b/src/dyld/unit-tests/test-cases/dlsym-RTLD_NEXT/test.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_NEXT/test.c
rename to src/dyld/unit-tests/test-cases/dlsym-RTLD_NEXT/test.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_SELF/foo.c b/src/dyld/unit-tests/test-cases/dlsym-RTLD_SELF/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_SELF/foo.c
rename to src/dyld/unit-tests/test-cases/dlsym-RTLD_SELF/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_SELF/main.c b/src/dyld/unit-tests/test-cases/dlsym-RTLD_SELF/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_SELF/main.c
rename to src/dyld/unit-tests/test-cases/dlsym-RTLD_SELF/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_SELF/test.c b/src/dyld/unit-tests/test-cases/dlsym-RTLD_SELF/test.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-RTLD_SELF/test.c
rename to src/dyld/unit-tests/test-cases/dlsym-RTLD_SELF/test.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-error/main.c b/src/dyld/unit-tests/test-cases/dlsym-error/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-error/main.c
rename to src/dyld/unit-tests/test-cases/dlsym-error/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-indirect/foo.c b/src/dyld/unit-tests/test-cases/dlsym-indirect/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-indirect/foo.c
rename to src/dyld/unit-tests/test-cases/dlsym-indirect/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-indirect/foo1.c b/src/dyld/unit-tests/test-cases/dlsym-indirect/foo1.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-indirect/foo1.c
rename to src/dyld/unit-tests/test-cases/dlsym-indirect/foo1.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-indirect/foo2.c b/src/dyld/unit-tests/test-cases/dlsym-indirect/foo2.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-indirect/foo2.c
rename to src/dyld/unit-tests/test-cases/dlsym-indirect/foo2.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-indirect/foo3.c b/src/dyld/unit-tests/test-cases/dlsym-indirect/foo3.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-indirect/foo3.c
rename to src/dyld/unit-tests/test-cases/dlsym-indirect/foo3.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dlsym-indirect/main.c b/src/dyld/unit-tests/test-cases/dlsym-indirect/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dlsym-indirect/main.c
rename to src/dyld/unit-tests/test-cases/dlsym-indirect/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dtrace-static-probes/foo.d b/src/dyld/unit-tests/test-cases/dtrace-static-probes/foo.d
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dtrace-static-probes/foo.d
rename to src/dyld/unit-tests/test-cases/dtrace-static-probes/foo.d
diff --git a/src/dyld-apple/unit-tests/test-cases/dtrace-static-probes/main.c b/src/dyld/unit-tests/test-cases/dtrace-static-probes/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dtrace-static-probes/main.c
rename to src/dyld/unit-tests/test-cases/dtrace-static-probes/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dyld-func-lookup/foo.c b/src/dyld/unit-tests/test-cases/dyld-func-lookup/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dyld-func-lookup/foo.c
rename to src/dyld/unit-tests/test-cases/dyld-func-lookup/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dyld-func-lookup/main.c b/src/dyld/unit-tests/test-cases/dyld-func-lookup/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dyld-func-lookup/main.c
rename to src/dyld/unit-tests/test-cases/dyld-func-lookup/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dyld-launched-prebound/main.c b/src/dyld/unit-tests/test-cases/dyld-launched-prebound/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dyld-launched-prebound/main.c
rename to src/dyld/unit-tests/test-cases/dyld-launched-prebound/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dyld_is_memory_immutable/bar.c b/src/dyld/unit-tests/test-cases/dyld_is_memory_immutable/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dyld_is_memory_immutable/bar.c
rename to src/dyld/unit-tests/test-cases/dyld_is_memory_immutable/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dyld_is_memory_immutable/foo.c b/src/dyld/unit-tests/test-cases/dyld_is_memory_immutable/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dyld_is_memory_immutable/foo.c
rename to src/dyld/unit-tests/test-cases/dyld_is_memory_immutable/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dyld_is_memory_immutable/main.c b/src/dyld/unit-tests/test-cases/dyld_is_memory_immutable/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dyld_is_memory_immutable/main.c
rename to src/dyld/unit-tests/test-cases/dyld_is_memory_immutable/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dyld_shared_cache_iterate_text/main.c b/src/dyld/unit-tests/test-cases/dyld_shared_cache_iterate_text/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dyld_shared_cache_iterate_text/main.c
rename to src/dyld/unit-tests/test-cases/dyld_shared_cache_iterate_text/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/dynamic_cast-basic/foo.cxx b/src/dyld/unit-tests/test-cases/dynamic_cast-basic/foo.cxx
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dynamic_cast-basic/foo.cxx
rename to src/dyld/unit-tests/test-cases/dynamic_cast-basic/foo.cxx
diff --git a/src/dyld-apple/unit-tests/test-cases/dynamic_cast-basic/foo.h b/src/dyld/unit-tests/test-cases/dynamic_cast-basic/foo.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dynamic_cast-basic/foo.h
rename to src/dyld/unit-tests/test-cases/dynamic_cast-basic/foo.h
diff --git a/src/dyld-apple/unit-tests/test-cases/dynamic_cast-basic/main.cxx b/src/dyld/unit-tests/test-cases/dynamic_cast-basic/main.cxx
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dynamic_cast-basic/main.cxx
rename to src/dyld/unit-tests/test-cases/dynamic_cast-basic/main.cxx
diff --git a/src/dyld-apple/unit-tests/test-cases/dynamic_cast-basic/realmain.cxx b/src/dyld/unit-tests/test-cases/dynamic_cast-basic/realmain.cxx
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/dynamic_cast-basic/realmain.cxx
rename to src/dyld/unit-tests/test-cases/dynamic_cast-basic/realmain.cxx
diff --git a/src/dyld-apple/unit-tests/test-cases/env-DYLD_FALLBACK_LIBRARY_PATH/compress.c b/src/dyld/unit-tests/test-cases/env-DYLD_FALLBACK_LIBRARY_PATH/compress.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/env-DYLD_FALLBACK_LIBRARY_PATH/compress.c
rename to src/dyld/unit-tests/test-cases/env-DYLD_FALLBACK_LIBRARY_PATH/compress.c
diff --git a/src/dyld-apple/unit-tests/test-cases/env-DYLD_FALLBACK_LIBRARY_PATH/main.c b/src/dyld/unit-tests/test-cases/env-DYLD_FALLBACK_LIBRARY_PATH/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/env-DYLD_FALLBACK_LIBRARY_PATH/main.c
rename to src/dyld/unit-tests/test-cases/env-DYLD_FALLBACK_LIBRARY_PATH/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/executable-image-index/foo.c b/src/dyld/unit-tests/test-cases/executable-image-index/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/executable-image-index/foo.c
rename to src/dyld/unit-tests/test-cases/executable-image-index/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/executable-image-index/main.c b/src/dyld/unit-tests/test-cases/executable-image-index/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/executable-image-index/main.c
rename to src/dyld/unit-tests/test-cases/executable-image-index/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/fallback-non-unique-leaf-names/bar.c b/src/dyld/unit-tests/test-cases/fallback-non-unique-leaf-names/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/fallback-non-unique-leaf-names/bar.c
rename to src/dyld/unit-tests/test-cases/fallback-non-unique-leaf-names/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/fallback-non-unique-leaf-names/foo.c b/src/dyld/unit-tests/test-cases/fallback-non-unique-leaf-names/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/fallback-non-unique-leaf-names/foo.c
rename to src/dyld/unit-tests/test-cases/fallback-non-unique-leaf-names/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/fallback-non-unique-leaf-names/main.c b/src/dyld/unit-tests/test-cases/fallback-non-unique-leaf-names/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/fallback-non-unique-leaf-names/main.c
rename to src/dyld/unit-tests/test-cases/fallback-non-unique-leaf-names/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/fallback-with-suid/foo.c b/src/dyld/unit-tests/test-cases/fallback-with-suid/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/fallback-with-suid/foo.c
rename to src/dyld/unit-tests/test-cases/fallback-with-suid/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/fallback-with-suid/main.c b/src/dyld/unit-tests/test-cases/fallback-with-suid/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/fallback-with-suid/main.c
rename to src/dyld/unit-tests/test-cases/fallback-with-suid/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/flat-data/bar.c b/src/dyld/unit-tests/test-cases/flat-data/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/flat-data/bar.c
rename to src/dyld/unit-tests/test-cases/flat-data/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/flat-data/getbar.c b/src/dyld/unit-tests/test-cases/flat-data/getbar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/flat-data/getbar.c
rename to src/dyld/unit-tests/test-cases/flat-data/getbar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/flat-data/main.c b/src/dyld/unit-tests/test-cases/flat-data/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/flat-data/main.c
rename to src/dyld/unit-tests/test-cases/flat-data/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/flat-insert/foo.c b/src/dyld/unit-tests/test-cases/flat-insert/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/flat-insert/foo.c
rename to src/dyld/unit-tests/test-cases/flat-insert/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/flat-insert/main.c b/src/dyld/unit-tests/test-cases/flat-insert/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/flat-insert/main.c
rename to src/dyld/unit-tests/test-cases/flat-insert/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/flat-prebound/bar.c b/src/dyld/unit-tests/test-cases/flat-prebound/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/flat-prebound/bar.c
rename to src/dyld/unit-tests/test-cases/flat-prebound/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/flat-prebound/foo.c b/src/dyld/unit-tests/test-cases/flat-prebound/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/flat-prebound/foo.c
rename to src/dyld/unit-tests/test-cases/flat-prebound/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/flat-prebound/main.c b/src/dyld/unit-tests/test-cases/flat-prebound/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/flat-prebound/main.c
rename to src/dyld/unit-tests/test-cases/flat-prebound/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/flat-private-extern/bar.c b/src/dyld/unit-tests/test-cases/flat-private-extern/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/flat-private-extern/bar.c
rename to src/dyld/unit-tests/test-cases/flat-private-extern/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/flat-private-extern/foo.c b/src/dyld/unit-tests/test-cases/flat-private-extern/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/flat-private-extern/foo.c
rename to src/dyld/unit-tests/test-cases/flat-private-extern/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/flat-private-extern/main.c b/src/dyld/unit-tests/test-cases/flat-private-extern/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/flat-private-extern/main.c
rename to src/dyld/unit-tests/test-cases/flat-private-extern/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/framework-DYLD_LIBRARY_PATH/foo.c b/src/dyld/unit-tests/test-cases/framework-DYLD_LIBRARY_PATH/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/framework-DYLD_LIBRARY_PATH/foo.c
rename to src/dyld/unit-tests/test-cases/framework-DYLD_LIBRARY_PATH/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/framework-DYLD_LIBRARY_PATH/main.c b/src/dyld/unit-tests/test-cases/framework-DYLD_LIBRARY_PATH/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/framework-DYLD_LIBRARY_PATH/main.c
rename to src/dyld/unit-tests/test-cases/framework-DYLD_LIBRARY_PATH/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/framework-fallback/main.c b/src/dyld/unit-tests/test-cases/framework-fallback/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/framework-fallback/main.c
rename to src/dyld/unit-tests/test-cases/framework-fallback/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/ignore-bad-files/foo.c b/src/dyld/unit-tests/test-cases/ignore-bad-files/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/ignore-bad-files/foo.c
rename to src/dyld/unit-tests/test-cases/ignore-bad-files/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/ignore-bad-files/main.c b/src/dyld/unit-tests/test-cases/ignore-bad-files/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/ignore-bad-files/main.c
rename to src/dyld/unit-tests/test-cases/ignore-bad-files/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-count/foo.c b/src/dyld/unit-tests/test-cases/image-count/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-count/foo.c
rename to src/dyld/unit-tests/test-cases/image-count/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-count/main.c b/src/dyld/unit-tests/test-cases/image-count/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-count/main.c
rename to src/dyld/unit-tests/test-cases/image-count/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-remove-crash/foo.c b/src/dyld/unit-tests/test-cases/image-remove-crash/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-remove-crash/foo.c
rename to src/dyld/unit-tests/test-cases/image-remove-crash/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-remove-crash/main.c b/src/dyld/unit-tests/test-cases/image-remove-crash/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-remove-crash/main.c
rename to src/dyld/unit-tests/test-cases/image-remove-crash/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-remove-notification/foo.c b/src/dyld/unit-tests/test-cases/image-remove-notification/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-remove-notification/foo.c
rename to src/dyld/unit-tests/test-cases/image-remove-notification/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-remove-notification/main.c b/src/dyld/unit-tests/test-cases/image-remove-notification/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-remove-notification/main.c
rename to src/dyld/unit-tests/test-cases/image-remove-notification/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-slide/foo.c b/src/dyld/unit-tests/test-cases/image-slide/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-slide/foo.c
rename to src/dyld/unit-tests/test-cases/image-slide/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-slide/main.c b/src/dyld/unit-tests/test-cases/image-slide/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-slide/main.c
rename to src/dyld/unit-tests/test-cases/image-slide/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-change/bar.c b/src/dyld/unit-tests/test-cases/image-state-change/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-change/bar.c
rename to src/dyld/unit-tests/test-cases/image-state-change/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-change/foo.c b/src/dyld/unit-tests/test-cases/image-state-change/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-change/foo.c
rename to src/dyld/unit-tests/test-cases/image-state-change/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-change/main.c b/src/dyld/unit-tests/test-cases/image-state-change/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-change/main.c
rename to src/dyld/unit-tests/test-cases/image-state-change/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny-OFI/bar.c b/src/dyld/unit-tests/test-cases/image-state-deny-OFI/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny-OFI/bar.c
rename to src/dyld/unit-tests/test-cases/image-state-deny-OFI/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny-OFI/foo.c b/src/dyld/unit-tests/test-cases/image-state-deny-OFI/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny-OFI/foo.c
rename to src/dyld/unit-tests/test-cases/image-state-deny-OFI/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny-OFI/main.c b/src/dyld/unit-tests/test-cases/image-state-deny-OFI/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny-OFI/main.c
rename to src/dyld/unit-tests/test-cases/image-state-deny-OFI/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny-all_image_infos/bar.c b/src/dyld/unit-tests/test-cases/image-state-deny-all_image_infos/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny-all_image_infos/bar.c
rename to src/dyld/unit-tests/test-cases/image-state-deny-all_image_infos/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny-all_image_infos/main.c b/src/dyld/unit-tests/test-cases/image-state-deny-all_image_infos/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny-all_image_infos/main.c
rename to src/dyld/unit-tests/test-cases/image-state-deny-all_image_infos/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny-cache-leak/bar.c b/src/dyld/unit-tests/test-cases/image-state-deny-cache-leak/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny-cache-leak/bar.c
rename to src/dyld/unit-tests/test-cases/image-state-deny-cache-leak/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny-cache-leak/foo.c b/src/dyld/unit-tests/test-cases/image-state-deny-cache-leak/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny-cache-leak/foo.c
rename to src/dyld/unit-tests/test-cases/image-state-deny-cache-leak/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny-cache-leak/main.c b/src/dyld/unit-tests/test-cases/image-state-deny-cache-leak/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny-cache-leak/main.c
rename to src/dyld/unit-tests/test-cases/image-state-deny-cache-leak/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny-dlclose/base.c b/src/dyld/unit-tests/test-cases/image-state-deny-dlclose/base.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny-dlclose/base.c
rename to src/dyld/unit-tests/test-cases/image-state-deny-dlclose/base.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny-dlclose/foo.c b/src/dyld/unit-tests/test-cases/image-state-deny-dlclose/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny-dlclose/foo.c
rename to src/dyld/unit-tests/test-cases/image-state-deny-dlclose/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny-dlclose/main.c b/src/dyld/unit-tests/test-cases/image-state-deny-dlclose/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny-dlclose/main.c
rename to src/dyld/unit-tests/test-cases/image-state-deny-dlclose/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny-leak/bar.c b/src/dyld/unit-tests/test-cases/image-state-deny-leak/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny-leak/bar.c
rename to src/dyld/unit-tests/test-cases/image-state-deny-leak/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny-leak/foo.c b/src/dyld/unit-tests/test-cases/image-state-deny-leak/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny-leak/foo.c
rename to src/dyld/unit-tests/test-cases/image-state-deny-leak/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny-leak/main.c b/src/dyld/unit-tests/test-cases/image-state-deny-leak/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny-leak/main.c
rename to src/dyld/unit-tests/test-cases/image-state-deny-leak/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny/bar.c b/src/dyld/unit-tests/test-cases/image-state-deny/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny/bar.c
rename to src/dyld/unit-tests/test-cases/image-state-deny/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny/foo.c b/src/dyld/unit-tests/test-cases/image-state-deny/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny/foo.c
rename to src/dyld/unit-tests/test-cases/image-state-deny/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-deny/main.c b/src/dyld/unit-tests/test-cases/image-state-deny/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-deny/main.c
rename to src/dyld/unit-tests/test-cases/image-state-deny/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-dependents-initialized/bar.c b/src/dyld/unit-tests/test-cases/image-state-dependents-initialized/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-dependents-initialized/bar.c
rename to src/dyld/unit-tests/test-cases/image-state-dependents-initialized/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-dependents-initialized/foo.c b/src/dyld/unit-tests/test-cases/image-state-dependents-initialized/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-dependents-initialized/foo.c
rename to src/dyld/unit-tests/test-cases/image-state-dependents-initialized/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-state-dependents-initialized/main.c b/src/dyld/unit-tests/test-cases/image-state-dependents-initialized/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-state-dependents-initialized/main.c
rename to src/dyld/unit-tests/test-cases/image-state-dependents-initialized/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-suffix/foo.c b/src/dyld/unit-tests/test-cases/image-suffix/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-suffix/foo.c
rename to src/dyld/unit-tests/test-cases/image-suffix/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image-suffix/main.c b/src/dyld/unit-tests/test-cases/image-suffix/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image-suffix/main.c
rename to src/dyld/unit-tests/test-cases/image-suffix/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image_header_containing_address/foo.c b/src/dyld/unit-tests/test-cases/image_header_containing_address/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image_header_containing_address/foo.c
rename to src/dyld/unit-tests/test-cases/image_header_containing_address/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image_header_containing_address/main.c b/src/dyld/unit-tests/test-cases/image_header_containing_address/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image_header_containing_address/main.c
rename to src/dyld/unit-tests/test-cases/image_header_containing_address/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image_path_containing_address/foo.c b/src/dyld/unit-tests/test-cases/image_path_containing_address/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image_path_containing_address/foo.c
rename to src/dyld/unit-tests/test-cases/image_path_containing_address/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/image_path_containing_address/main.c b/src/dyld/unit-tests/test-cases/image_path_containing_address/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/image_path_containing_address/main.c
rename to src/dyld/unit-tests/test-cases/image_path_containing_address/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/init-libSystem-first/foo.c b/src/dyld/unit-tests/test-cases/init-libSystem-first/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/init-libSystem-first/foo.c
rename to src/dyld/unit-tests/test-cases/init-libSystem-first/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/init-libSystem-first/main.c b/src/dyld/unit-tests/test-cases/init-libSystem-first/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/init-libSystem-first/main.c
rename to src/dyld/unit-tests/test-cases/init-libSystem-first/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/init-order/base.c b/src/dyld/unit-tests/test-cases/init-order/base.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/init-order/base.c
rename to src/dyld/unit-tests/test-cases/init-order/base.c
diff --git a/src/dyld-apple/unit-tests/test-cases/init-order/base.h b/src/dyld/unit-tests/test-cases/init-order/base.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/init-order/base.h
rename to src/dyld/unit-tests/test-cases/init-order/base.h
diff --git a/src/dyld-apple/unit-tests/test-cases/init-order/foo1.c b/src/dyld/unit-tests/test-cases/init-order/foo1.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/init-order/foo1.c
rename to src/dyld/unit-tests/test-cases/init-order/foo1.c
diff --git a/src/dyld-apple/unit-tests/test-cases/init-order/foo2.c b/src/dyld/unit-tests/test-cases/init-order/foo2.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/init-order/foo2.c
rename to src/dyld/unit-tests/test-cases/init-order/foo2.c
diff --git a/src/dyld-apple/unit-tests/test-cases/init-order/foo3.c b/src/dyld/unit-tests/test-cases/init-order/foo3.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/init-order/foo3.c
rename to src/dyld/unit-tests/test-cases/init-order/foo3.c
diff --git a/src/dyld-apple/unit-tests/test-cases/init-order/main.c b/src/dyld/unit-tests/test-cases/init-order/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/init-order/main.c
rename to src/dyld/unit-tests/test-cases/init-order/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/initializer-args/main.c b/src/dyld/unit-tests/test-cases/initializer-args/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/initializer-args/main.c
rename to src/dyld/unit-tests/test-cases/initializer-args/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/initializer-bounds-check/bar.c b/src/dyld/unit-tests/test-cases/initializer-bounds-check/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/initializer-bounds-check/bar.c
rename to src/dyld/unit-tests/test-cases/initializer-bounds-check/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/initializer-bounds-check/foo1.c b/src/dyld/unit-tests/test-cases/initializer-bounds-check/foo1.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/initializer-bounds-check/foo1.c
rename to src/dyld/unit-tests/test-cases/initializer-bounds-check/foo1.c
diff --git a/src/dyld-apple/unit-tests/test-cases/initializer-bounds-check/foo2.c b/src/dyld/unit-tests/test-cases/initializer-bounds-check/foo2.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/initializer-bounds-check/foo2.c
rename to src/dyld/unit-tests/test-cases/initializer-bounds-check/foo2.c
diff --git a/src/dyld-apple/unit-tests/test-cases/initializer-bounds-check/main.c b/src/dyld/unit-tests/test-cases/initializer-bounds-check/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/initializer-bounds-check/main.c
rename to src/dyld/unit-tests/test-cases/initializer-bounds-check/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/insert-libraries-weak-symbols/insert.c b/src/dyld/unit-tests/test-cases/insert-libraries-weak-symbols/insert.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/insert-libraries-weak-symbols/insert.c
rename to src/dyld/unit-tests/test-cases/insert-libraries-weak-symbols/insert.c
diff --git a/src/dyld-apple/unit-tests/test-cases/insert-libraries-weak-symbols/main.c b/src/dyld/unit-tests/test-cases/insert-libraries-weak-symbols/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/insert-libraries-weak-symbols/main.c
rename to src/dyld/unit-tests/test-cases/insert-libraries-weak-symbols/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/insert-libraries-with-initializer/base.c b/src/dyld/unit-tests/test-cases/insert-libraries-with-initializer/base.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/insert-libraries-with-initializer/base.c
rename to src/dyld/unit-tests/test-cases/insert-libraries-with-initializer/base.c
diff --git a/src/dyld-apple/unit-tests/test-cases/insert-libraries-with-initializer/base.h b/src/dyld/unit-tests/test-cases/insert-libraries-with-initializer/base.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/insert-libraries-with-initializer/base.h
rename to src/dyld/unit-tests/test-cases/insert-libraries-with-initializer/base.h
diff --git a/src/dyld-apple/unit-tests/test-cases/insert-libraries-with-initializer/foo1.c b/src/dyld/unit-tests/test-cases/insert-libraries-with-initializer/foo1.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/insert-libraries-with-initializer/foo1.c
rename to src/dyld/unit-tests/test-cases/insert-libraries-with-initializer/foo1.c
diff --git a/src/dyld-apple/unit-tests/test-cases/insert-libraries-with-initializer/foo2.c b/src/dyld/unit-tests/test-cases/insert-libraries-with-initializer/foo2.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/insert-libraries-with-initializer/foo2.c
rename to src/dyld/unit-tests/test-cases/insert-libraries-with-initializer/foo2.c
diff --git a/src/dyld-apple/unit-tests/test-cases/insert-libraries-with-initializer/insert.c b/src/dyld/unit-tests/test-cases/insert-libraries-with-initializer/insert.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/insert-libraries-with-initializer/insert.c
rename to src/dyld/unit-tests/test-cases/insert-libraries-with-initializer/insert.c
diff --git a/src/dyld-apple/unit-tests/test-cases/insert-libraries-with-initializer/main.c b/src/dyld/unit-tests/test-cases/insert-libraries-with-initializer/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/insert-libraries-with-initializer/main.c
rename to src/dyld/unit-tests/test-cases/insert-libraries-with-initializer/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/insert-libraries-with-suid/main.c b/src/dyld/unit-tests/test-cases/insert-libraries-with-suid/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/insert-libraries-with-suid/main.c
rename to src/dyld/unit-tests/test-cases/insert-libraries-with-suid/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-basic-prebound/foo.c b/src/dyld/unit-tests/test-cases/interpose-basic-prebound/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-basic-prebound/foo.c
rename to src/dyld/unit-tests/test-cases/interpose-basic-prebound/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-basic-prebound/main.c b/src/dyld/unit-tests/test-cases/interpose-basic-prebound/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-basic-prebound/main.c
rename to src/dyld/unit-tests/test-cases/interpose-basic-prebound/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-basic-prebound/mystrdup.c b/src/dyld/unit-tests/test-cases/interpose-basic-prebound/mystrdup.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-basic-prebound/mystrdup.c
rename to src/dyld/unit-tests/test-cases/interpose-basic-prebound/mystrdup.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-basic/main.c b/src/dyld/unit-tests/test-cases/interpose-basic/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-basic/main.c
rename to src/dyld/unit-tests/test-cases/interpose-basic/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-basic/mystrdup.c b/src/dyld/unit-tests/test-cases/interpose-basic/mystrdup.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-basic/mystrdup.c
rename to src/dyld/unit-tests/test-cases/interpose-basic/mystrdup.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-basic/wrap.c b/src/dyld/unit-tests/test-cases/interpose-basic/wrap.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-basic/wrap.c
rename to src/dyld/unit-tests/test-cases/interpose-basic/wrap.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-chained/foo.c b/src/dyld/unit-tests/test-cases/interpose-chained/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-chained/foo.c
rename to src/dyld/unit-tests/test-cases/interpose-chained/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-chained/foo.h b/src/dyld/unit-tests/test-cases/interpose-chained/foo.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-chained/foo.h
rename to src/dyld/unit-tests/test-cases/interpose-chained/foo.h
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-chained/foo1.c b/src/dyld/unit-tests/test-cases/interpose-chained/foo1.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-chained/foo1.c
rename to src/dyld/unit-tests/test-cases/interpose-chained/foo1.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-chained/foo2.c b/src/dyld/unit-tests/test-cases/interpose-chained/foo2.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-chained/foo2.c
rename to src/dyld/unit-tests/test-cases/interpose-chained/foo2.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-chained/foo3.c b/src/dyld/unit-tests/test-cases/interpose-chained/foo3.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-chained/foo3.c
rename to src/dyld/unit-tests/test-cases/interpose-chained/foo3.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-chained/main.c b/src/dyld/unit-tests/test-cases/interpose-chained/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-chained/main.c
rename to src/dyld/unit-tests/test-cases/interpose-chained/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-dlsym/main.c b/src/dyld/unit-tests/test-cases/interpose-dlsym/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-dlsym/main.c
rename to src/dyld/unit-tests/test-cases/interpose-dlsym/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-dlsym/myfree.c b/src/dyld/unit-tests/test-cases/interpose-dlsym/myfree.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-dlsym/myfree.c
rename to src/dyld/unit-tests/test-cases/interpose-dlsym/myfree.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-dynamic-basic/main.c b/src/dyld/unit-tests/test-cases/interpose-dynamic-basic/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-dynamic-basic/main.c
rename to src/dyld/unit-tests/test-cases/interpose-dynamic-basic/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-dynamic-dlsym/foo.c b/src/dyld/unit-tests/test-cases/interpose-dynamic-dlsym/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-dynamic-dlsym/foo.c
rename to src/dyld/unit-tests/test-cases/interpose-dynamic-dlsym/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-dynamic-dlsym/main.c b/src/dyld/unit-tests/test-cases/interpose-dynamic-dlsym/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-dynamic-dlsym/main.c
rename to src/dyld/unit-tests/test-cases/interpose-dynamic-dlsym/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-dynamic-lazy/foo.c b/src/dyld/unit-tests/test-cases/interpose-dynamic-lazy/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-dynamic-lazy/foo.c
rename to src/dyld/unit-tests/test-cases/interpose-dynamic-lazy/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-dynamic-lazy/main.c b/src/dyld/unit-tests/test-cases/interpose-dynamic-lazy/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-dynamic-lazy/main.c
rename to src/dyld/unit-tests/test-cases/interpose-dynamic-lazy/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-multiple/base.c b/src/dyld/unit-tests/test-cases/interpose-multiple/base.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-multiple/base.c
rename to src/dyld/unit-tests/test-cases/interpose-multiple/base.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-multiple/base.h b/src/dyld/unit-tests/test-cases/interpose-multiple/base.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-multiple/base.h
rename to src/dyld/unit-tests/test-cases/interpose-multiple/base.h
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-multiple/foo1.c b/src/dyld/unit-tests/test-cases/interpose-multiple/foo1.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-multiple/foo1.c
rename to src/dyld/unit-tests/test-cases/interpose-multiple/foo1.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-multiple/foo2.c b/src/dyld/unit-tests/test-cases/interpose-multiple/foo2.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-multiple/foo2.c
rename to src/dyld/unit-tests/test-cases/interpose-multiple/foo2.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-multiple/main.c b/src/dyld/unit-tests/test-cases/interpose-multiple/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-multiple/main.c
rename to src/dyld/unit-tests/test-cases/interpose-multiple/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-not-inserted/main.c b/src/dyld/unit-tests/test-cases/interpose-not-inserted/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-not-inserted/main.c
rename to src/dyld/unit-tests/test-cases/interpose-not-inserted/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-not-inserted/mystrdup.c b/src/dyld/unit-tests/test-cases/interpose-not-inserted/mystrdup.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-not-inserted/mystrdup.c
rename to src/dyld/unit-tests/test-cases/interpose-not-inserted/mystrdup.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-not-inserted/wrap.c b/src/dyld/unit-tests/test-cases/interpose-not-inserted/wrap.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-not-inserted/wrap.c
rename to src/dyld/unit-tests/test-cases/interpose-not-inserted/wrap.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-shared-cache/main.c b/src/dyld/unit-tests/test-cases/interpose-shared-cache/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-shared-cache/main.c
rename to src/dyld/unit-tests/test-cases/interpose-shared-cache/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/interpose-shared-cache/mymalloc.c b/src/dyld/unit-tests/test-cases/interpose-shared-cache/mymalloc.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/interpose-shared-cache/mymalloc.c
rename to src/dyld/unit-tests/test-cases/interpose-shared-cache/mymalloc.c
diff --git a/src/dyld-apple/unit-tests/test-cases/jump-table-dynamic-lookup/foo.c b/src/dyld/unit-tests/test-cases/jump-table-dynamic-lookup/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/jump-table-dynamic-lookup/foo.c
rename to src/dyld/unit-tests/test-cases/jump-table-dynamic-lookup/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/jump-table-dynamic-lookup/foo.h b/src/dyld/unit-tests/test-cases/jump-table-dynamic-lookup/foo.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/jump-table-dynamic-lookup/foo.h
rename to src/dyld/unit-tests/test-cases/jump-table-dynamic-lookup/foo.h
diff --git a/src/dyld-apple/unit-tests/test-cases/jump-table-dynamic-lookup/main.c b/src/dyld/unit-tests/test-cases/jump-table-dynamic-lookup/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/jump-table-dynamic-lookup/main.c
rename to src/dyld/unit-tests/test-cases/jump-table-dynamic-lookup/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/jump-table-race/foo.c b/src/dyld/unit-tests/test-cases/jump-table-race/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/jump-table-race/foo.c
rename to src/dyld/unit-tests/test-cases/jump-table-race/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/jump-table-race/foo.h b/src/dyld/unit-tests/test-cases/jump-table-race/foo.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/jump-table-race/foo.h
rename to src/dyld/unit-tests/test-cases/jump-table-race/foo.h
diff --git a/src/dyld-apple/unit-tests/test-cases/jump-table-race/main.c b/src/dyld/unit-tests/test-cases/jump-table-race/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/jump-table-race/main.c
rename to src/dyld/unit-tests/test-cases/jump-table-race/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/lazy-binding-reg-params/foo.c b/src/dyld/unit-tests/test-cases/lazy-binding-reg-params/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/lazy-binding-reg-params/foo.c
rename to src/dyld/unit-tests/test-cases/lazy-binding-reg-params/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/lazy-binding-reg-params/foo.h b/src/dyld/unit-tests/test-cases/lazy-binding-reg-params/foo.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/lazy-binding-reg-params/foo.h
rename to src/dyld/unit-tests/test-cases/lazy-binding-reg-params/foo.h
diff --git a/src/dyld-apple/unit-tests/test-cases/lazy-binding-reg-params/main.c b/src/dyld/unit-tests/test-cases/lazy-binding-reg-params/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/lazy-binding-reg-params/main.c
rename to src/dyld/unit-tests/test-cases/lazy-binding-reg-params/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/lazy-dylib-init-order/expected.out b/src/dyld/unit-tests/test-cases/lazy-dylib-init-order/expected.out
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/lazy-dylib-init-order/expected.out
rename to src/dyld/unit-tests/test-cases/lazy-dylib-init-order/expected.out
diff --git a/src/dyld-apple/unit-tests/test-cases/lazy-dylib-init-order/foo.c b/src/dyld/unit-tests/test-cases/lazy-dylib-init-order/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/lazy-dylib-init-order/foo.c
rename to src/dyld/unit-tests/test-cases/lazy-dylib-init-order/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/lazy-dylib-init-order/main.c b/src/dyld/unit-tests/test-cases/lazy-dylib-init-order/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/lazy-dylib-init-order/main.c
rename to src/dyld/unit-tests/test-cases/lazy-dylib-init-order/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/lazy-dylib-missing-dylib/foo.c b/src/dyld/unit-tests/test-cases/lazy-dylib-missing-dylib/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/lazy-dylib-missing-dylib/foo.c
rename to src/dyld/unit-tests/test-cases/lazy-dylib-missing-dylib/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/lazy-dylib-missing-dylib/main.c b/src/dyld/unit-tests/test-cases/lazy-dylib-missing-dylib/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/lazy-dylib-missing-dylib/main.c
rename to src/dyld/unit-tests/test-cases/lazy-dylib-missing-dylib/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/lazy-dylib-missing-symbol/foo.c b/src/dyld/unit-tests/test-cases/lazy-dylib-missing-symbol/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/lazy-dylib-missing-symbol/foo.c
rename to src/dyld/unit-tests/test-cases/lazy-dylib-missing-symbol/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/lazy-dylib-missing-symbol/main.c b/src/dyld/unit-tests/test-cases/lazy-dylib-missing-symbol/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/lazy-dylib-missing-symbol/main.c
rename to src/dyld/unit-tests/test-cases/lazy-dylib-missing-symbol/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/lazy-pointer-binding/foo.c b/src/dyld/unit-tests/test-cases/lazy-pointer-binding/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/lazy-pointer-binding/foo.c
rename to src/dyld/unit-tests/test-cases/lazy-pointer-binding/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/lazy-pointer-binding/main.c b/src/dyld/unit-tests/test-cases/lazy-pointer-binding/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/lazy-pointer-binding/main.c
rename to src/dyld/unit-tests/test-cases/lazy-pointer-binding/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/lib-name-overload/foo.c b/src/dyld/unit-tests/test-cases/lib-name-overload/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/lib-name-overload/foo.c
rename to src/dyld/unit-tests/test-cases/lib-name-overload/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/lib-name-overload/foo2.c b/src/dyld/unit-tests/test-cases/lib-name-overload/foo2.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/lib-name-overload/foo2.c
rename to src/dyld/unit-tests/test-cases/lib-name-overload/foo2.c
diff --git a/src/dyld-apple/unit-tests/test-cases/lib-name-overload/main.c b/src/dyld/unit-tests/test-cases/lib-name-overload/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/lib-name-overload/main.c
rename to src/dyld/unit-tests/test-cases/lib-name-overload/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/loader_path-dup/bar.c b/src/dyld/unit-tests/test-cases/loader_path-dup/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/loader_path-dup/bar.c
rename to src/dyld/unit-tests/test-cases/loader_path-dup/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/loader_path-dup/base.c b/src/dyld/unit-tests/test-cases/loader_path-dup/base.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/loader_path-dup/base.c
rename to src/dyld/unit-tests/test-cases/loader_path-dup/base.c
diff --git a/src/dyld-apple/unit-tests/test-cases/loader_path-dup/foo.c b/src/dyld/unit-tests/test-cases/loader_path-dup/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/loader_path-dup/foo.c
rename to src/dyld/unit-tests/test-cases/loader_path-dup/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/loader_path-dup/main.c b/src/dyld/unit-tests/test-cases/loader_path-dup/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/loader_path-dup/main.c
rename to src/dyld/unit-tests/test-cases/loader_path-dup/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/loader_path-symlink/bar.c b/src/dyld/unit-tests/test-cases/loader_path-symlink/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/loader_path-symlink/bar.c
rename to src/dyld/unit-tests/test-cases/loader_path-symlink/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/loader_path-symlink/foo.c b/src/dyld/unit-tests/test-cases/loader_path-symlink/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/loader_path-symlink/foo.c
rename to src/dyld/unit-tests/test-cases/loader_path-symlink/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/loader_path-symlink/main.c b/src/dyld/unit-tests/test-cases/loader_path-symlink/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/loader_path-symlink/main.c
rename to src/dyld/unit-tests/test-cases/loader_path-symlink/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/loader_path/bar.c b/src/dyld/unit-tests/test-cases/loader_path/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/loader_path/bar.c
rename to src/dyld/unit-tests/test-cases/loader_path/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/loader_path/foo.c b/src/dyld/unit-tests/test-cases/loader_path/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/loader_path/foo.c
rename to src/dyld/unit-tests/test-cases/loader_path/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/loader_path/main.c b/src/dyld/unit-tests/test-cases/loader_path/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/loader_path/main.c
rename to src/dyld/unit-tests/test-cases/loader_path/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/missing-symlink-framework-fallback-path/Foo.c b/src/dyld/unit-tests/test-cases/missing-symlink-framework-fallback-path/Foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/missing-symlink-framework-fallback-path/Foo.c
rename to src/dyld/unit-tests/test-cases/missing-symlink-framework-fallback-path/Foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/missing-symlink-framework-fallback-path/main.c b/src/dyld/unit-tests/test-cases/missing-symlink-framework-fallback-path/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/missing-symlink-framework-fallback-path/main.c
rename to src/dyld/unit-tests/test-cases/missing-symlink-framework-fallback-path/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/non-lazy-slide/bar.c b/src/dyld/unit-tests/test-cases/non-lazy-slide/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/non-lazy-slide/bar.c
rename to src/dyld/unit-tests/test-cases/non-lazy-slide/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/non-lazy-slide/foo.c b/src/dyld/unit-tests/test-cases/non-lazy-slide/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/non-lazy-slide/foo.c
rename to src/dyld/unit-tests/test-cases/non-lazy-slide/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/non-lazy-slide/main.c b/src/dyld/unit-tests/test-cases/non-lazy-slide/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/non-lazy-slide/main.c
rename to src/dyld/unit-tests/test-cases/non-lazy-slide/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/non-lazy-weak/bar.c b/src/dyld/unit-tests/test-cases/non-lazy-weak/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/non-lazy-weak/bar.c
rename to src/dyld/unit-tests/test-cases/non-lazy-weak/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/non-lazy-weak/foo.c b/src/dyld/unit-tests/test-cases/non-lazy-weak/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/non-lazy-weak/foo.c
rename to src/dyld/unit-tests/test-cases/non-lazy-weak/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/non-lazy-weak/main.c b/src/dyld/unit-tests/test-cases/non-lazy-weak/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/non-lazy-weak/main.c
rename to src/dyld/unit-tests/test-cases/non-lazy-weak/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/non-weak-library/foo.c b/src/dyld/unit-tests/test-cases/non-weak-library/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/non-weak-library/foo.c
rename to src/dyld/unit-tests/test-cases/non-weak-library/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/non-weak-library/main.c b/src/dyld/unit-tests/test-cases/non-weak-library/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/non-weak-library/main.c
rename to src/dyld/unit-tests/test-cases/non-weak-library/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/operator-new-dylib/foo.cxx b/src/dyld/unit-tests/test-cases/operator-new-dylib/foo.cxx
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/operator-new-dylib/foo.cxx
rename to src/dyld/unit-tests/test-cases/operator-new-dylib/foo.cxx
diff --git a/src/dyld-apple/unit-tests/test-cases/operator-new-dylib/main.cxx b/src/dyld/unit-tests/test-cases/operator-new-dylib/main.cxx
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/operator-new-dylib/main.cxx
rename to src/dyld/unit-tests/test-cases/operator-new-dylib/main.cxx
diff --git a/src/dyld-apple/unit-tests/test-cases/operator-new/main.cxx b/src/dyld/unit-tests/test-cases/operator-new/main.cxx
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/operator-new/main.cxx
rename to src/dyld/unit-tests/test-cases/operator-new/main.cxx
diff --git a/src/dyld-apple/unit-tests/test-cases/partial-library-load/bar.c b/src/dyld/unit-tests/test-cases/partial-library-load/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/partial-library-load/bar.c
rename to src/dyld/unit-tests/test-cases/partial-library-load/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/partial-library-load/bundle.c b/src/dyld/unit-tests/test-cases/partial-library-load/bundle.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/partial-library-load/bundle.c
rename to src/dyld/unit-tests/test-cases/partial-library-load/bundle.c
diff --git a/src/dyld-apple/unit-tests/test-cases/partial-library-load/foo.c b/src/dyld/unit-tests/test-cases/partial-library-load/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/partial-library-load/foo.c
rename to src/dyld/unit-tests/test-cases/partial-library-load/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/partial-library-load/main.c b/src/dyld/unit-tests/test-cases/partial-library-load/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/partial-library-load/main.c
rename to src/dyld/unit-tests/test-cases/partial-library-load/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/pie-basic/main.c b/src/dyld/unit-tests/test-cases/pie-basic/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/pie-basic/main.c
rename to src/dyld/unit-tests/test-cases/pie-basic/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/pie-big/main.c b/src/dyld/unit-tests/test-cases/pie-big/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/pie-big/main.c
rename to src/dyld/unit-tests/test-cases/pie-big/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/pie-custom-stack/main.c b/src/dyld/unit-tests/test-cases/pie-custom-stack/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/pie-custom-stack/main.c
rename to src/dyld/unit-tests/test-cases/pie-custom-stack/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/pie-dylib/foo.c b/src/dyld/unit-tests/test-cases/pie-dylib/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/pie-dylib/foo.c
rename to src/dyld/unit-tests/test-cases/pie-dylib/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/pie-dylib/main.c b/src/dyld/unit-tests/test-cases/pie-dylib/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/pie-dylib/main.c
rename to src/dyld/unit-tests/test-cases/pie-dylib/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/pie-text-reloc/main.c b/src/dyld/unit-tests/test-cases/pie-text-reloc/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/pie-text-reloc/main.c
rename to src/dyld/unit-tests/test-cases/pie-text-reloc/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/prebased-performance/foo.c b/src/dyld/unit-tests/test-cases/prebased-performance/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/prebased-performance/foo.c
rename to src/dyld/unit-tests/test-cases/prebased-performance/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/prebased-performance/main.c b/src/dyld/unit-tests/test-cases/prebased-performance/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/prebased-performance/main.c
rename to src/dyld/unit-tests/test-cases/prebased-performance/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/progname/main.c b/src/dyld/unit-tests/test-cases/progname/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/progname/main.c
rename to src/dyld/unit-tests/test-cases/progname/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/pthread-keys/main.c b/src/dyld/unit-tests/test-cases/pthread-keys/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/pthread-keys/main.c
rename to src/dyld/unit-tests/test-cases/pthread-keys/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-dylib/bar.c b/src/dyld/unit-tests/test-cases/re-export-dylib/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-dylib/bar.c
rename to src/dyld/unit-tests/test-cases/re-export-dylib/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-dylib/foo.c b/src/dyld/unit-tests/test-cases/re-export-dylib/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-dylib/foo.c
rename to src/dyld/unit-tests/test-cases/re-export-dylib/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-dylib/main.c b/src/dyld/unit-tests/test-cases/re-export-dylib/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-dylib/main.c
rename to src/dyld/unit-tests/test-cases/re-export-dylib/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-framework/bar.c b/src/dyld/unit-tests/test-cases/re-export-framework/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-framework/bar.c
rename to src/dyld/unit-tests/test-cases/re-export-framework/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-framework/foo.c b/src/dyld/unit-tests/test-cases/re-export-framework/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-framework/foo.c
rename to src/dyld/unit-tests/test-cases/re-export-framework/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-framework/main.c b/src/dyld/unit-tests/test-cases/re-export-framework/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-framework/main.c
rename to src/dyld/unit-tests/test-cases/re-export-framework/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-sub-framework/bar.c b/src/dyld/unit-tests/test-cases/re-export-sub-framework/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-sub-framework/bar.c
rename to src/dyld/unit-tests/test-cases/re-export-sub-framework/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-sub-framework/foo.c b/src/dyld/unit-tests/test-cases/re-export-sub-framework/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-sub-framework/foo.c
rename to src/dyld/unit-tests/test-cases/re-export-sub-framework/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-sub-framework/main.c b/src/dyld/unit-tests/test-cases/re-export-sub-framework/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-sub-framework/main.c
rename to src/dyld/unit-tests/test-cases/re-export-sub-framework/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-symbol-dylib/bar.c b/src/dyld/unit-tests/test-cases/re-export-symbol-dylib/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-symbol-dylib/bar.c
rename to src/dyld/unit-tests/test-cases/re-export-symbol-dylib/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-symbol-dylib/baz.c b/src/dyld/unit-tests/test-cases/re-export-symbol-dylib/baz.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-symbol-dylib/baz.c
rename to src/dyld/unit-tests/test-cases/re-export-symbol-dylib/baz.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-symbol-dylib/baz.exp b/src/dyld/unit-tests/test-cases/re-export-symbol-dylib/baz.exp
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-symbol-dylib/baz.exp
rename to src/dyld/unit-tests/test-cases/re-export-symbol-dylib/baz.exp
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-symbol-dylib/foo.c b/src/dyld/unit-tests/test-cases/re-export-symbol-dylib/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-symbol-dylib/foo.c
rename to src/dyld/unit-tests/test-cases/re-export-symbol-dylib/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-symbol-dylib/foo.exp b/src/dyld/unit-tests/test-cases/re-export-symbol-dylib/foo.exp
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-symbol-dylib/foo.exp
rename to src/dyld/unit-tests/test-cases/re-export-symbol-dylib/foo.exp
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-symbol-dylib/frob.c b/src/dyld/unit-tests/test-cases/re-export-symbol-dylib/frob.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-symbol-dylib/frob.c
rename to src/dyld/unit-tests/test-cases/re-export-symbol-dylib/frob.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-symbol-dylib/main.c b/src/dyld/unit-tests/test-cases/re-export-symbol-dylib/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-symbol-dylib/main.c
rename to src/dyld/unit-tests/test-cases/re-export-symbol-dylib/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-symbol/bar.c b/src/dyld/unit-tests/test-cases/re-export-symbol/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-symbol/bar.c
rename to src/dyld/unit-tests/test-cases/re-export-symbol/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-symbol/foo.c b/src/dyld/unit-tests/test-cases/re-export-symbol/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-symbol/foo.c
rename to src/dyld/unit-tests/test-cases/re-export-symbol/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-symbol/foo.exp b/src/dyld/unit-tests/test-cases/re-export-symbol/foo.exp
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-symbol/foo.exp
rename to src/dyld/unit-tests/test-cases/re-export-symbol/foo.exp
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-symbol/foo2.exp b/src/dyld/unit-tests/test-cases/re-export-symbol/foo2.exp
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-symbol/foo2.exp
rename to src/dyld/unit-tests/test-cases/re-export-symbol/foo2.exp
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-symbol/main1.c b/src/dyld/unit-tests/test-cases/re-export-symbol/main1.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-symbol/main1.c
rename to src/dyld/unit-tests/test-cases/re-export-symbol/main1.c
diff --git a/src/dyld-apple/unit-tests/test-cases/re-export-symbol/main2.c b/src/dyld/unit-tests/test-cases/re-export-symbol/main2.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/re-export-symbol/main2.c
rename to src/dyld/unit-tests/test-cases/re-export-symbol/main2.c
diff --git a/src/dyld-apple/unit-tests/test-cases/read-only-import-shared-cache-coalesce/foo.cxx b/src/dyld/unit-tests/test-cases/read-only-import-shared-cache-coalesce/foo.cxx
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/read-only-import-shared-cache-coalesce/foo.cxx
rename to src/dyld/unit-tests/test-cases/read-only-import-shared-cache-coalesce/foo.cxx
diff --git a/src/dyld-apple/unit-tests/test-cases/read-only-import-shared-cache-coalesce/main.c b/src/dyld/unit-tests/test-cases/read-only-import-shared-cache-coalesce/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/read-only-import-shared-cache-coalesce/main.c
rename to src/dyld/unit-tests/test-cases/read-only-import-shared-cache-coalesce/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/read-only-import-shared-cache-dlopen-override/main.c b/src/dyld/unit-tests/test-cases/read-only-import-shared-cache-dlopen-override/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/read-only-import-shared-cache-dlopen-override/main.c
rename to src/dyld/unit-tests/test-cases/read-only-import-shared-cache-dlopen-override/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/read-only-import-shared-cache-dlopen-override/mymalloc.c b/src/dyld/unit-tests/test-cases/read-only-import-shared-cache-dlopen-override/mymalloc.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/read-only-import-shared-cache-dlopen-override/mymalloc.c
rename to src/dyld/unit-tests/test-cases/read-only-import-shared-cache-dlopen-override/mymalloc.c
diff --git a/src/dyld-apple/unit-tests/test-cases/read-only-stubs/bar.c b/src/dyld/unit-tests/test-cases/read-only-stubs/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/read-only-stubs/bar.c
rename to src/dyld/unit-tests/test-cases/read-only-stubs/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/read-only-stubs/foo.c b/src/dyld/unit-tests/test-cases/read-only-stubs/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/read-only-stubs/foo.c
rename to src/dyld/unit-tests/test-cases/read-only-stubs/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/read-only-stubs/main.c b/src/dyld/unit-tests/test-cases/read-only-stubs/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/read-only-stubs/main.c
rename to src/dyld/unit-tests/test-cases/read-only-stubs/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/restrict-environ/main.c b/src/dyld/unit-tests/test-cases/restrict-environ/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/restrict-environ/main.c
rename to src/dyld/unit-tests/test-cases/restrict-environ/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/restrict-executable_path/foo.c b/src/dyld/unit-tests/test-cases/restrict-executable_path/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/restrict-executable_path/foo.c
rename to src/dyld/unit-tests/test-cases/restrict-executable_path/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/restrict-executable_path/main.c b/src/dyld/unit-tests/test-cases/restrict-executable_path/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/restrict-executable_path/main.c
rename to src/dyld/unit-tests/test-cases/restrict-executable_path/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-DYLD_FALLBACK_LIBRARY_PATH/foo.c b/src/dyld/unit-tests/test-cases/rpath-DYLD_FALLBACK_LIBRARY_PATH/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-DYLD_FALLBACK_LIBRARY_PATH/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-DYLD_FALLBACK_LIBRARY_PATH/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-DYLD_FALLBACK_LIBRARY_PATH/main.c b/src/dyld/unit-tests/test-cases/rpath-DYLD_FALLBACK_LIBRARY_PATH/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-DYLD_FALLBACK_LIBRARY_PATH/main.c
rename to src/dyld/unit-tests/test-cases/rpath-DYLD_FALLBACK_LIBRARY_PATH/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-DYLD_LIBRARY_PATH/foo.c b/src/dyld/unit-tests/test-cases/rpath-DYLD_LIBRARY_PATH/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-DYLD_LIBRARY_PATH/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-DYLD_LIBRARY_PATH/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-DYLD_LIBRARY_PATH/main.c b/src/dyld/unit-tests/test-cases/rpath-DYLD_LIBRARY_PATH/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-DYLD_LIBRARY_PATH/main.c
rename to src/dyld/unit-tests/test-cases/rpath-DYLD_LIBRARY_PATH/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-DYLD_ROOT_PATH/foo.c b/src/dyld/unit-tests/test-cases/rpath-DYLD_ROOT_PATH/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-DYLD_ROOT_PATH/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-DYLD_ROOT_PATH/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-DYLD_ROOT_PATH/main.c b/src/dyld/unit-tests/test-cases/rpath-DYLD_ROOT_PATH/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-DYLD_ROOT_PATH/main.c
rename to src/dyld/unit-tests/test-cases/rpath-DYLD_ROOT_PATH/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-LD_LIBRARY_PATH/foo.c b/src/dyld/unit-tests/test-cases/rpath-LD_LIBRARY_PATH/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-LD_LIBRARY_PATH/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-LD_LIBRARY_PATH/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-LD_LIBRARY_PATH/main.c b/src/dyld/unit-tests/test-cases/rpath-LD_LIBRARY_PATH/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-LD_LIBRARY_PATH/main.c
rename to src/dyld/unit-tests/test-cases/rpath-LD_LIBRARY_PATH/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-basic/bar.c b/src/dyld/unit-tests/test-cases/rpath-basic/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-basic/bar.c
rename to src/dyld/unit-tests/test-cases/rpath-basic/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-basic/foo.c b/src/dyld/unit-tests/test-cases/rpath-basic/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-basic/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-basic/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-basic/main.c b/src/dyld/unit-tests/test-cases/rpath-basic/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-basic/main.c
rename to src/dyld/unit-tests/test-cases/rpath-basic/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-dlopen-in-dylib/bar.c b/src/dyld/unit-tests/test-cases/rpath-dlopen-in-dylib/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-dlopen-in-dylib/bar.c
rename to src/dyld/unit-tests/test-cases/rpath-dlopen-in-dylib/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-dlopen-in-dylib/foo.c b/src/dyld/unit-tests/test-cases/rpath-dlopen-in-dylib/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-dlopen-in-dylib/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-dlopen-in-dylib/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-dlopen-in-dylib/main.c b/src/dyld/unit-tests/test-cases/rpath-dlopen-in-dylib/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-dlopen-in-dylib/main.c
rename to src/dyld/unit-tests/test-cases/rpath-dlopen-in-dylib/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-dlopen-indirect/bar.c b/src/dyld/unit-tests/test-cases/rpath-dlopen-indirect/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-dlopen-indirect/bar.c
rename to src/dyld/unit-tests/test-cases/rpath-dlopen-indirect/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-dlopen-indirect/foo.c b/src/dyld/unit-tests/test-cases/rpath-dlopen-indirect/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-dlopen-indirect/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-dlopen-indirect/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-dlopen-indirect/main.c b/src/dyld/unit-tests/test-cases/rpath-dlopen-indirect/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-dlopen-indirect/main.c
rename to src/dyld/unit-tests/test-cases/rpath-dlopen-indirect/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-dlopen-leak/foo.c b/src/dyld/unit-tests/test-cases/rpath-dlopen-leak/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-dlopen-leak/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-dlopen-leak/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-dlopen-leak/main.c b/src/dyld/unit-tests/test-cases/rpath-dlopen-leak/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-dlopen-leak/main.c
rename to src/dyld/unit-tests/test-cases/rpath-dlopen-leak/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-dlopen-rm-executable/foo.c b/src/dyld/unit-tests/test-cases/rpath-dlopen-rm-executable/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-dlopen-rm-executable/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-dlopen-rm-executable/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-dlopen-rm-executable/main.c b/src/dyld/unit-tests/test-cases/rpath-dlopen-rm-executable/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-dlopen-rm-executable/main.c
rename to src/dyld/unit-tests/test-cases/rpath-dlopen-rm-executable/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-dlopen/foo.c b/src/dyld/unit-tests/test-cases/rpath-dlopen/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-dlopen/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-dlopen/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-dlopen/main.c b/src/dyld/unit-tests/test-cases/rpath-dlopen/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-dlopen/main.c
rename to src/dyld/unit-tests/test-cases/rpath-dlopen/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-executable_path/bar.c b/src/dyld/unit-tests/test-cases/rpath-executable_path/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-executable_path/bar.c
rename to src/dyld/unit-tests/test-cases/rpath-executable_path/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-executable_path/foo.c b/src/dyld/unit-tests/test-cases/rpath-executable_path/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-executable_path/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-executable_path/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-executable_path/main.c b/src/dyld/unit-tests/test-cases/rpath-executable_path/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-executable_path/main.c
rename to src/dyld/unit-tests/test-cases/rpath-executable_path/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-indirect-suid/bar.c b/src/dyld/unit-tests/test-cases/rpath-indirect-suid/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-indirect-suid/bar.c
rename to src/dyld/unit-tests/test-cases/rpath-indirect-suid/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-indirect-suid/foo.c b/src/dyld/unit-tests/test-cases/rpath-indirect-suid/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-indirect-suid/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-indirect-suid/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-indirect-suid/main.c b/src/dyld/unit-tests/test-cases/rpath-indirect-suid/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-indirect-suid/main.c
rename to src/dyld/unit-tests/test-cases/rpath-indirect-suid/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-install-name/bar.c b/src/dyld/unit-tests/test-cases/rpath-install-name/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-install-name/bar.c
rename to src/dyld/unit-tests/test-cases/rpath-install-name/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-install-name/main.c b/src/dyld/unit-tests/test-cases/rpath-install-name/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-install-name/main.c
rename to src/dyld/unit-tests/test-cases/rpath-install-name/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-install-name/stuff.c b/src/dyld/unit-tests/test-cases/rpath-install-name/stuff.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-install-name/stuff.c
rename to src/dyld/unit-tests/test-cases/rpath-install-name/stuff.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-introspection/foo.c b/src/dyld/unit-tests/test-cases/rpath-introspection/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-introspection/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-introspection/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-introspection/main.c b/src/dyld/unit-tests/test-cases/rpath-introspection/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-introspection/main.c
rename to src/dyld/unit-tests/test-cases/rpath-introspection/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-loader_path-dlopen/bar.c b/src/dyld/unit-tests/test-cases/rpath-loader_path-dlopen/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-loader_path-dlopen/bar.c
rename to src/dyld/unit-tests/test-cases/rpath-loader_path-dlopen/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-loader_path-dlopen/baz.c b/src/dyld/unit-tests/test-cases/rpath-loader_path-dlopen/baz.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-loader_path-dlopen/baz.c
rename to src/dyld/unit-tests/test-cases/rpath-loader_path-dlopen/baz.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-loader_path-dlopen/foo.c b/src/dyld/unit-tests/test-cases/rpath-loader_path-dlopen/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-loader_path-dlopen/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-loader_path-dlopen/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-loader_path-dlopen/main.c b/src/dyld/unit-tests/test-cases/rpath-loader_path-dlopen/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-loader_path-dlopen/main.c
rename to src/dyld/unit-tests/test-cases/rpath-loader_path-dlopen/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-loader_path/foo.c b/src/dyld/unit-tests/test-cases/rpath-loader_path/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-loader_path/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-loader_path/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-loader_path/main.c b/src/dyld/unit-tests/test-cases/rpath-loader_path/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-loader_path/main.c
rename to src/dyld/unit-tests/test-cases/rpath-loader_path/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-nesting/bar.c b/src/dyld/unit-tests/test-cases/rpath-nesting/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-nesting/bar.c
rename to src/dyld/unit-tests/test-cases/rpath-nesting/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-nesting/baz.c b/src/dyld/unit-tests/test-cases/rpath-nesting/baz.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-nesting/baz.c
rename to src/dyld/unit-tests/test-cases/rpath-nesting/baz.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-nesting/foo.c b/src/dyld/unit-tests/test-cases/rpath-nesting/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-nesting/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-nesting/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-nesting/main.c b/src/dyld/unit-tests/test-cases/rpath-nesting/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-nesting/main.c
rename to src/dyld/unit-tests/test-cases/rpath-nesting/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-no-trailing-slash/foo.c b/src/dyld/unit-tests/test-cases/rpath-no-trailing-slash/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-no-trailing-slash/foo.c
rename to src/dyld/unit-tests/test-cases/rpath-no-trailing-slash/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/rpath-no-trailing-slash/main.c b/src/dyld/unit-tests/test-cases/rpath-no-trailing-slash/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/rpath-no-trailing-slash/main.c
rename to src/dyld/unit-tests/test-cases/rpath-no-trailing-slash/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/shared-cache-symlink/main.c b/src/dyld/unit-tests/test-cases/shared-cache-symlink/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/shared-cache-symlink/main.c
rename to src/dyld/unit-tests/test-cases/shared-cache-symlink/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/shared-region-overlap/main.c b/src/dyld/unit-tests/test-cases/shared-region-overlap/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/shared-region-overlap/main.c
rename to src/dyld/unit-tests/test-cases/shared-region-overlap/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/suid-environ/main.c b/src/dyld/unit-tests/test-cases/suid-environ/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/suid-environ/main.c
rename to src/dyld/unit-tests/test-cases/suid-environ/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/suid-executable_path/foo.c b/src/dyld/unit-tests/test-cases/suid-executable_path/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/suid-executable_path/foo.c
rename to src/dyld/unit-tests/test-cases/suid-executable_path/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/suid-executable_path/main.c b/src/dyld/unit-tests/test-cases/suid-executable_path/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/suid-executable_path/main.c
rename to src/dyld/unit-tests/test-cases/suid-executable_path/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/sym-link-load/base.c b/src/dyld/unit-tests/test-cases/sym-link-load/base.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/sym-link-load/base.c
rename to src/dyld/unit-tests/test-cases/sym-link-load/base.c
diff --git a/src/dyld-apple/unit-tests/test-cases/sym-link-load/base.h b/src/dyld/unit-tests/test-cases/sym-link-load/base.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/sym-link-load/base.h
rename to src/dyld/unit-tests/test-cases/sym-link-load/base.h
diff --git a/src/dyld-apple/unit-tests/test-cases/sym-link-load/link.c b/src/dyld/unit-tests/test-cases/sym-link-load/link.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/sym-link-load/link.c
rename to src/dyld/unit-tests/test-cases/sym-link-load/link.c
diff --git a/src/dyld-apple/unit-tests/test-cases/sym-link-load/main.c b/src/dyld/unit-tests/test-cases/sym-link-load/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/sym-link-load/main.c
rename to src/dyld/unit-tests/test-cases/sym-link-load/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/sym-link-load/test.c b/src/dyld/unit-tests/test-cases/sym-link-load/test.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/sym-link-load/test.c
rename to src/dyld/unit-tests/test-cases/sym-link-load/test.c
diff --git a/src/dyld-apple/unit-tests/test-cases/symbol-resolver-basic/foo.c b/src/dyld/unit-tests/test-cases/symbol-resolver-basic/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/symbol-resolver-basic/foo.c
rename to src/dyld/unit-tests/test-cases/symbol-resolver-basic/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/symbol-resolver-basic/foo2.c b/src/dyld/unit-tests/test-cases/symbol-resolver-basic/foo2.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/symbol-resolver-basic/foo2.c
rename to src/dyld/unit-tests/test-cases/symbol-resolver-basic/foo2.c
diff --git a/src/dyld-apple/unit-tests/test-cases/symbol-resolver-basic/main.c b/src/dyld/unit-tests/test-cases/symbol-resolver-basic/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/symbol-resolver-basic/main.c
rename to src/dyld/unit-tests/test-cases/symbol-resolver-basic/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/symbol-resolver-interposed/foo.c b/src/dyld/unit-tests/test-cases/symbol-resolver-interposed/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/symbol-resolver-interposed/foo.c
rename to src/dyld/unit-tests/test-cases/symbol-resolver-interposed/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/symbol-resolver-interposed/foo.h b/src/dyld/unit-tests/test-cases/symbol-resolver-interposed/foo.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/symbol-resolver-interposed/foo.h
rename to src/dyld/unit-tests/test-cases/symbol-resolver-interposed/foo.h
diff --git a/src/dyld-apple/unit-tests/test-cases/symbol-resolver-interposed/main.c b/src/dyld/unit-tests/test-cases/symbol-resolver-interposed/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/symbol-resolver-interposed/main.c
rename to src/dyld/unit-tests/test-cases/symbol-resolver-interposed/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/symbol-resolver-interposed/myfoo.c b/src/dyld/unit-tests/test-cases/symbol-resolver-interposed/myfoo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/symbol-resolver-interposed/myfoo.c
rename to src/dyld/unit-tests/test-cases/symbol-resolver-interposed/myfoo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/symbol-resolver-lazy-prebound/bar.c b/src/dyld/unit-tests/test-cases/symbol-resolver-lazy-prebound/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/symbol-resolver-lazy-prebound/bar.c
rename to src/dyld/unit-tests/test-cases/symbol-resolver-lazy-prebound/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/symbol-resolver-lazy-prebound/foo.c b/src/dyld/unit-tests/test-cases/symbol-resolver-lazy-prebound/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/symbol-resolver-lazy-prebound/foo.c
rename to src/dyld/unit-tests/test-cases/symbol-resolver-lazy-prebound/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/symbol-resolver-lazy-prebound/main.c b/src/dyld/unit-tests/test-cases/symbol-resolver-lazy-prebound/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/symbol-resolver-lazy-prebound/main.c
rename to src/dyld/unit-tests/test-cases/symbol-resolver-lazy-prebound/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/symbol-resolver-pointer/foo.c b/src/dyld/unit-tests/test-cases/symbol-resolver-pointer/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/symbol-resolver-pointer/foo.c
rename to src/dyld/unit-tests/test-cases/symbol-resolver-pointer/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/symbol-resolver-pointer/main.c b/src/dyld/unit-tests/test-cases/symbol-resolver-pointer/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/symbol-resolver-pointer/main.c
rename to src/dyld/unit-tests/test-cases/symbol-resolver-pointer/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/template/main.c b/src/dyld/unit-tests/test-cases/template/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/template/main.c
rename to src/dyld/unit-tests/test-cases/template/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/terminator-bounds-check/main.c b/src/dyld/unit-tests/test-cases/terminator-bounds-check/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/terminator-bounds-check/main.c
rename to src/dyld/unit-tests/test-cases/terminator-bounds-check/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/text-perm-alt-segment/foo.c b/src/dyld/unit-tests/test-cases/text-perm-alt-segment/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/text-perm-alt-segment/foo.c
rename to src/dyld/unit-tests/test-cases/text-perm-alt-segment/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/text-perm-alt-segment/main.c b/src/dyld/unit-tests/test-cases/text-perm-alt-segment/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/text-perm-alt-segment/main.c
rename to src/dyld/unit-tests/test-cases/text-perm-alt-segment/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/text-relocs-perms/foo.c b/src/dyld/unit-tests/test-cases/text-relocs-perms/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/text-relocs-perms/foo.c
rename to src/dyld/unit-tests/test-cases/text-relocs-perms/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/text-relocs-perms/main.c b/src/dyld/unit-tests/test-cases/text-relocs-perms/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/text-relocs-perms/main.c
rename to src/dyld/unit-tests/test-cases/text-relocs-perms/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/text-relocs/bar.c b/src/dyld/unit-tests/test-cases/text-relocs/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/text-relocs/bar.c
rename to src/dyld/unit-tests/test-cases/text-relocs/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/text-relocs/bind.c b/src/dyld/unit-tests/test-cases/text-relocs/bind.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/text-relocs/bind.c
rename to src/dyld/unit-tests/test-cases/text-relocs/bind.c
diff --git a/src/dyld-apple/unit-tests/test-cases/text-relocs/main.c b/src/dyld/unit-tests/test-cases/text-relocs/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/text-relocs/main.c
rename to src/dyld/unit-tests/test-cases/text-relocs/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/text-relocs/space.s b/src/dyld/unit-tests/test-cases/text-relocs/space.s
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/text-relocs/space.s
rename to src/dyld/unit-tests/test-cases/text-relocs/space.s
diff --git a/src/dyld-apple/unit-tests/test-cases/threaded-flat-lookup/client.c b/src/dyld/unit-tests/test-cases/threaded-flat-lookup/client.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/threaded-flat-lookup/client.c
rename to src/dyld/unit-tests/test-cases/threaded-flat-lookup/client.c
diff --git a/src/dyld-apple/unit-tests/test-cases/threaded-flat-lookup/foo.c b/src/dyld/unit-tests/test-cases/threaded-flat-lookup/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/threaded-flat-lookup/foo.c
rename to src/dyld/unit-tests/test-cases/threaded-flat-lookup/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/threaded-flat-lookup/main.c b/src/dyld/unit-tests/test-cases/threaded-flat-lookup/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/threaded-flat-lookup/main.c
rename to src/dyld/unit-tests/test-cases/threaded-flat-lookup/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/threaded-lazy-bind/foo.c b/src/dyld/unit-tests/test-cases/threaded-lazy-bind/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/threaded-lazy-bind/foo.c
rename to src/dyld/unit-tests/test-cases/threaded-lazy-bind/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/threaded-lazy-bind/gen.c b/src/dyld/unit-tests/test-cases/threaded-lazy-bind/gen.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/threaded-lazy-bind/gen.c
rename to src/dyld/unit-tests/test-cases/threaded-lazy-bind/gen.c
diff --git a/src/dyld-apple/unit-tests/test-cases/threaded-lazy-bind/main.c b/src/dyld/unit-tests/test-cases/threaded-lazy-bind/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/threaded-lazy-bind/main.c
rename to src/dyld/unit-tests/test-cases/threaded-lazy-bind/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/tlv-basic/main.c b/src/dyld/unit-tests/test-cases/tlv-basic/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/tlv-basic/main.c
rename to src/dyld/unit-tests/test-cases/tlv-basic/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/tlv-dylib/foo.c b/src/dyld/unit-tests/test-cases/tlv-dylib/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/tlv-dylib/foo.c
rename to src/dyld/unit-tests/test-cases/tlv-dylib/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/tlv-dylib/main.c b/src/dyld/unit-tests/test-cases/tlv-dylib/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/tlv-dylib/main.c
rename to src/dyld/unit-tests/test-cases/tlv-dylib/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/tlv-initializer/get.s b/src/dyld/unit-tests/test-cases/tlv-initializer/get.s
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/tlv-initializer/get.s
rename to src/dyld/unit-tests/test-cases/tlv-initializer/get.s
diff --git a/src/dyld-apple/unit-tests/test-cases/tlv-initializer/main.c b/src/dyld/unit-tests/test-cases/tlv-initializer/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/tlv-initializer/main.c
rename to src/dyld/unit-tests/test-cases/tlv-initializer/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/tlv-terminators/init.s b/src/dyld/unit-tests/test-cases/tlv-terminators/init.s
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/tlv-terminators/init.s
rename to src/dyld/unit-tests/test-cases/tlv-terminators/init.s
diff --git a/src/dyld-apple/unit-tests/test-cases/tlv-terminators/main.c b/src/dyld/unit-tests/test-cases/tlv-terminators/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/tlv-terminators/main.c
rename to src/dyld/unit-tests/test-cases/tlv-terminators/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/trie-symbol-overrun/foo.c b/src/dyld/unit-tests/test-cases/trie-symbol-overrun/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/trie-symbol-overrun/foo.c
rename to src/dyld/unit-tests/test-cases/trie-symbol-overrun/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/trie-symbol-overrun/main.c b/src/dyld/unit-tests/test-cases/trie-symbol-overrun/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/trie-symbol-overrun/main.c
rename to src/dyld/unit-tests/test-cases/trie-symbol-overrun/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/unloadable-library-residue/bar.c b/src/dyld/unit-tests/test-cases/unloadable-library-residue/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/unloadable-library-residue/bar.c
rename to src/dyld/unit-tests/test-cases/unloadable-library-residue/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/unloadable-library-residue/foo.c b/src/dyld/unit-tests/test-cases/unloadable-library-residue/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/unloadable-library-residue/foo.c
rename to src/dyld/unit-tests/test-cases/unloadable-library-residue/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/unloadable-library-residue/main.c b/src/dyld/unit-tests/test-cases/unloadable-library-residue/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/unloadable-library-residue/main.c
rename to src/dyld/unit-tests/test-cases/unloadable-library-residue/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/upward-dylib-init-order/b.c b/src/dyld/unit-tests/test-cases/upward-dylib-init-order/b.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/upward-dylib-init-order/b.c
rename to src/dyld/unit-tests/test-cases/upward-dylib-init-order/b.c
diff --git a/src/dyld-apple/unit-tests/test-cases/upward-dylib-init-order/c.c b/src/dyld/unit-tests/test-cases/upward-dylib-init-order/c.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/upward-dylib-init-order/c.c
rename to src/dyld/unit-tests/test-cases/upward-dylib-init-order/c.c
diff --git a/src/dyld-apple/unit-tests/test-cases/upward-dylib-init-order/common.c b/src/dyld/unit-tests/test-cases/upward-dylib-init-order/common.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/upward-dylib-init-order/common.c
rename to src/dyld/unit-tests/test-cases/upward-dylib-init-order/common.c
diff --git a/src/dyld-apple/unit-tests/test-cases/upward-dylib-init-order/common.h b/src/dyld/unit-tests/test-cases/upward-dylib-init-order/common.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/upward-dylib-init-order/common.h
rename to src/dyld/unit-tests/test-cases/upward-dylib-init-order/common.h
diff --git a/src/dyld-apple/unit-tests/test-cases/upward-dylib-init-order/main.c b/src/dyld/unit-tests/test-cases/upward-dylib-init-order/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/upward-dylib-init-order/main.c
rename to src/dyld/unit-tests/test-cases/upward-dylib-init-order/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/upward-dylib-init-order/u.c b/src/dyld/unit-tests/test-cases/upward-dylib-init-order/u.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/upward-dylib-init-order/u.c
rename to src/dyld/unit-tests/test-cases/upward-dylib-init-order/u.c
diff --git a/src/dyld-apple/unit-tests/test-cases/upward-dylib-init-order/u2.c b/src/dyld/unit-tests/test-cases/upward-dylib-init-order/u2.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/upward-dylib-init-order/u2.c
rename to src/dyld/unit-tests/test-cases/upward-dylib-init-order/u2.c
diff --git a/src/dyld-apple/unit-tests/test-cases/upward-dylib/down.c b/src/dyld/unit-tests/test-cases/upward-dylib/down.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/upward-dylib/down.c
rename to src/dyld/unit-tests/test-cases/upward-dylib/down.c
diff --git a/src/dyld-apple/unit-tests/test-cases/upward-dylib/down.h b/src/dyld/unit-tests/test-cases/upward-dylib/down.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/upward-dylib/down.h
rename to src/dyld/unit-tests/test-cases/upward-dylib/down.h
diff --git a/src/dyld-apple/unit-tests/test-cases/upward-dylib/main.c b/src/dyld/unit-tests/test-cases/upward-dylib/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/upward-dylib/main.c
rename to src/dyld/unit-tests/test-cases/upward-dylib/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/upward-dylib/main2.c b/src/dyld/unit-tests/test-cases/upward-dylib/main2.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/upward-dylib/main2.c
rename to src/dyld/unit-tests/test-cases/upward-dylib/main2.c
diff --git a/src/dyld-apple/unit-tests/test-cases/upward-dylib/up.c b/src/dyld/unit-tests/test-cases/upward-dylib/up.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/upward-dylib/up.c
rename to src/dyld/unit-tests/test-cases/upward-dylib/up.c
diff --git a/src/dyld-apple/unit-tests/test-cases/upward-dylib/up.h b/src/dyld/unit-tests/test-cases/upward-dylib/up.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/upward-dylib/up.h
rename to src/dyld/unit-tests/test-cases/upward-dylib/up.h
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce-c++/a.h b/src/dyld/unit-tests/test-cases/weak-coalesce-c++/a.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce-c++/a.h
rename to src/dyld/unit-tests/test-cases/weak-coalesce-c++/a.h
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce-c++/a1.cc b/src/dyld/unit-tests/test-cases/weak-coalesce-c++/a1.cc
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce-c++/a1.cc
rename to src/dyld/unit-tests/test-cases/weak-coalesce-c++/a1.cc
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce-c++/a2.cc b/src/dyld/unit-tests/test-cases/weak-coalesce-c++/a2.cc
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce-c++/a2.cc
rename to src/dyld/unit-tests/test-cases/weak-coalesce-c++/a2.cc
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce-c++/main.cc b/src/dyld/unit-tests/test-cases/weak-coalesce-c++/main.cc
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce-c++/main.cc
rename to src/dyld/unit-tests/test-cases/weak-coalesce-c++/main.cc
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce-inserted/base.c b/src/dyld/unit-tests/test-cases/weak-coalesce-inserted/base.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce-inserted/base.c
rename to src/dyld/unit-tests/test-cases/weak-coalesce-inserted/base.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce-inserted/base.h b/src/dyld/unit-tests/test-cases/weak-coalesce-inserted/base.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce-inserted/base.h
rename to src/dyld/unit-tests/test-cases/weak-coalesce-inserted/base.h
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce-inserted/foo1.c b/src/dyld/unit-tests/test-cases/weak-coalesce-inserted/foo1.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce-inserted/foo1.c
rename to src/dyld/unit-tests/test-cases/weak-coalesce-inserted/foo1.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce-inserted/foo2.c b/src/dyld/unit-tests/test-cases/weak-coalesce-inserted/foo2.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce-inserted/foo2.c
rename to src/dyld/unit-tests/test-cases/weak-coalesce-inserted/foo2.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce-inserted/main.c b/src/dyld/unit-tests/test-cases/weak-coalesce-inserted/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce-inserted/main.c
rename to src/dyld/unit-tests/test-cases/weak-coalesce-inserted/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce-stubs/bar.c b/src/dyld/unit-tests/test-cases/weak-coalesce-stubs/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce-stubs/bar.c
rename to src/dyld/unit-tests/test-cases/weak-coalesce-stubs/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce-stubs/foo.c b/src/dyld/unit-tests/test-cases/weak-coalesce-stubs/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce-stubs/foo.c
rename to src/dyld/unit-tests/test-cases/weak-coalesce-stubs/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce-stubs/main.c b/src/dyld/unit-tests/test-cases/weak-coalesce-stubs/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce-stubs/main.c
rename to src/dyld/unit-tests/test-cases/weak-coalesce-stubs/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce/base.c b/src/dyld/unit-tests/test-cases/weak-coalesce/base.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce/base.c
rename to src/dyld/unit-tests/test-cases/weak-coalesce/base.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce/base.h b/src/dyld/unit-tests/test-cases/weak-coalesce/base.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce/base.h
rename to src/dyld/unit-tests/test-cases/weak-coalesce/base.h
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce/foo1.c b/src/dyld/unit-tests/test-cases/weak-coalesce/foo1.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce/foo1.c
rename to src/dyld/unit-tests/test-cases/weak-coalesce/foo1.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce/foo2.c b/src/dyld/unit-tests/test-cases/weak-coalesce/foo2.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce/foo2.c
rename to src/dyld/unit-tests/test-cases/weak-coalesce/foo2.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce/foo3.c b/src/dyld/unit-tests/test-cases/weak-coalesce/foo3.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce/foo3.c
rename to src/dyld/unit-tests/test-cases/weak-coalesce/foo3.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-coalesce/main.c b/src/dyld/unit-tests/test-cases/weak-coalesce/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-coalesce/main.c
rename to src/dyld/unit-tests/test-cases/weak-coalesce/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-external-reloc-flat/bar.c b/src/dyld/unit-tests/test-cases/weak-external-reloc-flat/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-external-reloc-flat/bar.c
rename to src/dyld/unit-tests/test-cases/weak-external-reloc-flat/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-external-reloc-flat/baz.c b/src/dyld/unit-tests/test-cases/weak-external-reloc-flat/baz.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-external-reloc-flat/baz.c
rename to src/dyld/unit-tests/test-cases/weak-external-reloc-flat/baz.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-external-reloc-flat/foo.c b/src/dyld/unit-tests/test-cases/weak-external-reloc-flat/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-external-reloc-flat/foo.c
rename to src/dyld/unit-tests/test-cases/weak-external-reloc-flat/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-external-reloc-flat/main.c b/src/dyld/unit-tests/test-cases/weak-external-reloc-flat/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-external-reloc-flat/main.c
rename to src/dyld/unit-tests/test-cases/weak-external-reloc-flat/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-external-reloc/bar.c b/src/dyld/unit-tests/test-cases/weak-external-reloc/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-external-reloc/bar.c
rename to src/dyld/unit-tests/test-cases/weak-external-reloc/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-external-reloc/baz.c b/src/dyld/unit-tests/test-cases/weak-external-reloc/baz.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-external-reloc/baz.c
rename to src/dyld/unit-tests/test-cases/weak-external-reloc/baz.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-external-reloc/foo.c b/src/dyld/unit-tests/test-cases/weak-external-reloc/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-external-reloc/foo.c
rename to src/dyld/unit-tests/test-cases/weak-external-reloc/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-external-reloc/main.c b/src/dyld/unit-tests/test-cases/weak-external-reloc/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-external-reloc/main.c
rename to src/dyld/unit-tests/test-cases/weak-external-reloc/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-external-reloc/realmain.c b/src/dyld/unit-tests/test-cases/weak-external-reloc/realmain.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-external-reloc/realmain.c
rename to src/dyld/unit-tests/test-cases/weak-external-reloc/realmain.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-in-dylib/foo.c b/src/dyld/unit-tests/test-cases/weak-in-dylib/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-in-dylib/foo.c
rename to src/dyld/unit-tests/test-cases/weak-in-dylib/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-in-dylib/main.c b/src/dyld/unit-tests/test-cases/weak-in-dylib/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-in-dylib/main.c
rename to src/dyld/unit-tests/test-cases/weak-in-dylib/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-lazy-slidable/bar.c b/src/dyld/unit-tests/test-cases/weak-lazy-slidable/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-lazy-slidable/bar.c
rename to src/dyld/unit-tests/test-cases/weak-lazy-slidable/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-lazy-slidable/bar3.c b/src/dyld/unit-tests/test-cases/weak-lazy-slidable/bar3.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-lazy-slidable/bar3.c
rename to src/dyld/unit-tests/test-cases/weak-lazy-slidable/bar3.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-lazy-slidable/foo.c b/src/dyld/unit-tests/test-cases/weak-lazy-slidable/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-lazy-slidable/foo.c
rename to src/dyld/unit-tests/test-cases/weak-lazy-slidable/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-lazy-slidable/main.c b/src/dyld/unit-tests/test-cases/weak-lazy-slidable/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-lazy-slidable/main.c
rename to src/dyld/unit-tests/test-cases/weak-lazy-slidable/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-lazy-slidable/other.c b/src/dyld/unit-tests/test-cases/weak-lazy-slidable/other.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-lazy-slidable/other.c
rename to src/dyld/unit-tests/test-cases/weak-lazy-slidable/other.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-library/foo.c b/src/dyld/unit-tests/test-cases/weak-library/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-library/foo.c
rename to src/dyld/unit-tests/test-cases/weak-library/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-library/foo.h b/src/dyld/unit-tests/test-cases/weak-library/foo.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-library/foo.h
rename to src/dyld/unit-tests/test-cases/weak-library/foo.h
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-library/main.c b/src/dyld/unit-tests/test-cases/weak-library/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-library/main.c
rename to src/dyld/unit-tests/test-cases/weak-library/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-non-lazy/bar.c b/src/dyld/unit-tests/test-cases/weak-non-lazy/bar.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-non-lazy/bar.c
rename to src/dyld/unit-tests/test-cases/weak-non-lazy/bar.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-non-lazy/baz.c b/src/dyld/unit-tests/test-cases/weak-non-lazy/baz.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-non-lazy/baz.c
rename to src/dyld/unit-tests/test-cases/weak-non-lazy/baz.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-non-lazy/foo.c b/src/dyld/unit-tests/test-cases/weak-non-lazy/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-non-lazy/foo.c
rename to src/dyld/unit-tests/test-cases/weak-non-lazy/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-non-lazy/main.c b/src/dyld/unit-tests/test-cases/weak-non-lazy/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-non-lazy/main.c
rename to src/dyld/unit-tests/test-cases/weak-non-lazy/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-non-lazy/realmain.c b/src/dyld/unit-tests/test-cases/weak-non-lazy/realmain.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-non-lazy/realmain.c
rename to src/dyld/unit-tests/test-cases/weak-non-lazy/realmain.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-override/foo.c b/src/dyld/unit-tests/test-cases/weak-override/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-override/foo.c
rename to src/dyld/unit-tests/test-cases/weak-override/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-override/main.c b/src/dyld/unit-tests/test-cases/weak-override/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-override/main.c
rename to src/dyld/unit-tests/test-cases/weak-override/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-symbol-flat/foo.c b/src/dyld/unit-tests/test-cases/weak-symbol-flat/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-symbol-flat/foo.c
rename to src/dyld/unit-tests/test-cases/weak-symbol-flat/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-symbol-flat/foo.h b/src/dyld/unit-tests/test-cases/weak-symbol-flat/foo.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-symbol-flat/foo.h
rename to src/dyld/unit-tests/test-cases/weak-symbol-flat/foo.h
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-symbol-flat/main.c b/src/dyld/unit-tests/test-cases/weak-symbol-flat/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-symbol-flat/main.c
rename to src/dyld/unit-tests/test-cases/weak-symbol-flat/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-symbol/foo.c b/src/dyld/unit-tests/test-cases/weak-symbol/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-symbol/foo.c
rename to src/dyld/unit-tests/test-cases/weak-symbol/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-symbol/foo.h b/src/dyld/unit-tests/test-cases/weak-symbol/foo.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-symbol/foo.h
rename to src/dyld/unit-tests/test-cases/weak-symbol/foo.h
diff --git a/src/dyld-apple/unit-tests/test-cases/weak-symbol/main.c b/src/dyld/unit-tests/test-cases/weak-symbol/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak-symbol/main.c
rename to src/dyld/unit-tests/test-cases/weak-symbol/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak_import/foo.c b/src/dyld/unit-tests/test-cases/weak_import/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak_import/foo.c
rename to src/dyld/unit-tests/test-cases/weak_import/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/weak_import/foo.h b/src/dyld/unit-tests/test-cases/weak_import/foo.h
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak_import/foo.h
rename to src/dyld/unit-tests/test-cases/weak_import/foo.h
diff --git a/src/dyld-apple/unit-tests/test-cases/weak_import/main.c b/src/dyld/unit-tests/test-cases/weak_import/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/weak_import/main.c
rename to src/dyld/unit-tests/test-cases/weak_import/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/zero-fill-segment/foo.c b/src/dyld/unit-tests/test-cases/zero-fill-segment/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/zero-fill-segment/foo.c
rename to src/dyld/unit-tests/test-cases/zero-fill-segment/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/zero-fill-segment/main.c b/src/dyld/unit-tests/test-cases/zero-fill-segment/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/zero-fill-segment/main.c
rename to src/dyld/unit-tests/test-cases/zero-fill-segment/main.c
diff --git a/src/dyld-apple/unit-tests/test-cases/zero-fill-segment/zero.s b/src/dyld/unit-tests/test-cases/zero-fill-segment/zero.s
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/zero-fill-segment/zero.s
rename to src/dyld/unit-tests/test-cases/zero-fill-segment/zero.s
diff --git a/src/dyld-apple/unit-tests/test-cases/zero-length-segment/foo.c b/src/dyld/unit-tests/test-cases/zero-length-segment/foo.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/zero-length-segment/foo.c
rename to src/dyld/unit-tests/test-cases/zero-length-segment/foo.c
diff --git a/src/dyld-apple/unit-tests/test-cases/zero-length-segment/main.c b/src/dyld/unit-tests/test-cases/zero-length-segment/main.c
similarity index 100%
rename from src/dyld-apple/unit-tests/test-cases/zero-length-segment/main.c
rename to src/dyld/unit-tests/test-cases/zero-length-segment/main.c
diff --git a/src/external/objc4 b/src/external/objc4
index 3b785d087..256815270 160000
--- a/src/external/objc4
+++ b/src/external/objc4
@@ -1 +1 @@
-Subproject commit 3b785d0878e5dcdaf57a5a23c13ab52d7061ee8e
+Subproject commit 256815270954fcc9ac9c23a0e9119a53752c9153
diff --git a/src/kernel/emulation/linux/CMakeLists.txt b/src/kernel/emulation/linux/CMakeLists.txt
index 63c8d40a4..429c7befc 100644
--- a/src/kernel/emulation/linux/CMakeLists.txt
+++ b/src/kernel/emulation/linux/CMakeLists.txt
@@ -14,7 +14,7 @@ add_definitions(-DBSDTHREAD_WRAP_LINUX_PTHREAD
 	-DEMULATED_VERSION="Darwin Kernel Version 16.0.0")
 
 
-include_directories(${CMAKE_SOURCE_DIR}/src/dyld)
+include_directories(${CMAKE_SOURCE_DIR}/src/startup)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 set(emulation_sources
diff --git a/src/kernel/emulation/linux/bsdthread/bsdthread_create.c b/src/kernel/emulation/linux/bsdthread/bsdthread_create.c
index fcd0dda7d..b7a226006 100644
--- a/src/kernel/emulation/linux/bsdthread/bsdthread_create.c
+++ b/src/kernel/emulation/linux/bsdthread/bsdthread_create.c
@@ -6,7 +6,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include "../../../../../platform-include/sys/mman.h"
-#include "../../../../dyld/threads.h"
+#include "../../../../startup/threads.h"
 #include "../../../../../platform-include/sys/errno.h"
 #include "../mman/mman.h"
 #include "../simple.h"
diff --git a/src/kernel/emulation/linux/bsdthread/workq_kernreturn.c b/src/kernel/emulation/linux/bsdthread/workq_kernreturn.c
index f267c1ee8..b05887210 100644
--- a/src/kernel/emulation/linux/bsdthread/workq_kernreturn.c
+++ b/src/kernel/emulation/linux/bsdthread/workq_kernreturn.c
@@ -4,7 +4,7 @@
 #include "../base.h"
 #include "../errno.h"
 #include "../../../../../platform-include/sys/errno.h"
-#include "../../../../dyld/threads.h"
+#include "../../../../startup/threads.h"
 #include <linux-syscalls/linux.h>
 #include <stddef.h>
 #include "../ext/futex.h"
diff --git a/src/kernel/libsyscall/CMakeLists.txt b/src/kernel/libsyscall/CMakeLists.txt
index 4c8239ef8..78b95d04e 100644
--- a/src/kernel/libsyscall/CMakeLists.txt
+++ b/src/kernel/libsyscall/CMakeLists.txt
@@ -10,7 +10,7 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/mach")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../iokit")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/os")
 include_directories("${CMAKE_SOURCE_DIR}/platform-include")
-include_directories("${CMAKE_SOURCE_DIR}/src/dyld") # for elfcalls.h
+include_directories("${CMAKE_SOURCE_DIR}/src/startup") # for elfcalls.h
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../libc/include")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../duct/include")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/wrappers/libproc")
diff --git a/src/dyld/32in64.h b/src/startup/32in64.h
similarity index 100%
rename from src/dyld/32in64.h
rename to src/startup/32in64.h
diff --git a/src/startup/CMakeLists.txt b/src/startup/CMakeLists.txt
new file mode 100644
index 000000000..a305a6f59
--- /dev/null
+++ b/src/startup/CMakeLists.txt
@@ -0,0 +1,48 @@
+project(dyld-bin)
+
+cmake_minimum_required(VERSION 2.4.0)
+
+if(COMMAND cmake_policy)
+	cmake_policy(SET CMP0003 NEW)
+	cmake_policy(SET CMP0005 NEW)
+endif(COMMAND cmake_policy)
+
+enable_language(C ASM)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Ttext-segment,0x400000 -Wl,-Tbss,0x410000 -Wl,-Tdata,0x420000")
+add_definitions(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}" -D_GNU_SOURCE -DMLDR_BUILD)
+
+add_executable(darling darling.c)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+set(mldr_sources
+	mldr.c
+	threads.c
+	gdb.c
+	commpage.c
+	elfcalls.c
+)
+add_executable(mldr ${mldr_sources})
+target_link_libraries(mldr pthread dl)
+
+add_executable(mldr32 ${mldr_sources})
+target_link_libraries(mldr32 pthread dl)
+set_target_properties(mldr32
+	PROPERTIES
+		COMPILE_FLAGS "-m32"
+		LINK_FLAGS "-m32"
+)
+
+add_executable(wrapgen wrapgen/wrapgen.cpp)
+target_link_libraries(wrapgen dl)
+
+install(TARGETS mldr mldr32 DESTINATION libexec/darling/bin)
+install(TARGETS darling DESTINATION bin
+    PERMISSIONS
+    OWNER_READ OWNER_WRITE OWNER_EXECUTE
+    GROUP_READ GROUP_EXECUTE
+    WORLD_READ WORLD_EXECUTE
+    SETUID)
diff --git a/src/dyld/commpage.c b/src/startup/commpage.c
similarity index 100%
rename from src/dyld/commpage.c
rename to src/startup/commpage.c
diff --git a/src/dyld/commpage.h b/src/startup/commpage.h
similarity index 100%
rename from src/dyld/commpage.h
rename to src/startup/commpage.h
diff --git a/src/dyld/darling.c b/src/startup/darling.c
similarity index 100%
rename from src/dyld/darling.c
rename to src/startup/darling.c
diff --git a/src/dyld/darling.h b/src/startup/darling.h
similarity index 100%
rename from src/dyld/darling.h
rename to src/startup/darling.h
diff --git a/src/dyld/dirstructure.cpp b/src/startup/dirstructure.cpp
similarity index 100%
rename from src/dyld/dirstructure.cpp
rename to src/startup/dirstructure.cpp
diff --git a/src/dyld/dirstructure.h b/src/startup/dirstructure.h
similarity index 100%
rename from src/dyld/dirstructure.h
rename to src/startup/dirstructure.h
diff --git a/src/dyld/elfcalls.c b/src/startup/elfcalls.c
similarity index 100%
rename from src/dyld/elfcalls.c
rename to src/startup/elfcalls.c
diff --git a/src/dyld/elfcalls.h b/src/startup/elfcalls.h
similarity index 100%
rename from src/dyld/elfcalls.h
rename to src/startup/elfcalls.h
diff --git a/src/dyld/gdb.c b/src/startup/gdb.c
similarity index 100%
rename from src/dyld/gdb.c
rename to src/startup/gdb.c
diff --git a/src/dyld/gdb.h b/src/startup/gdb.h
similarity index 100%
rename from src/dyld/gdb.h
rename to src/startup/gdb.h
diff --git a/src/dyld/loader.c b/src/startup/loader.c
similarity index 100%
rename from src/dyld/loader.c
rename to src/startup/loader.c
diff --git a/src/dyld/mach b/src/startup/mach
similarity index 100%
rename from src/dyld/mach
rename to src/startup/mach
diff --git a/src/dyld/mach-o b/src/startup/mach-o
similarity index 100%
rename from src/dyld/mach-o
rename to src/startup/mach-o
diff --git a/src/dyld/mldr.c b/src/startup/mldr.c
similarity index 100%
rename from src/dyld/mldr.c
rename to src/startup/mldr.c
diff --git a/src/dyld/sys/_types b/src/startup/sys/_types
similarity index 100%
rename from src/dyld/sys/_types
rename to src/startup/sys/_types
diff --git a/src/dyld/sys/_types.h b/src/startup/sys/_types.h
similarity index 100%
rename from src/dyld/sys/_types.h
rename to src/startup/sys/_types.h
diff --git a/src/dyld/threads.c b/src/startup/threads.c
similarity index 100%
rename from src/dyld/threads.c
rename to src/startup/threads.c
diff --git a/src/dyld/threads.h b/src/startup/threads.h
similarity index 100%
rename from src/dyld/threads.h
rename to src/startup/threads.h
diff --git a/src/dyld/wrapgen/produce_stubs_example.h b/src/startup/wrapgen/produce_stubs_example.h
similarity index 100%
rename from src/dyld/wrapgen/produce_stubs_example.h
rename to src/startup/wrapgen/produce_stubs_example.h
diff --git a/src/dyld/wrapgen/stubgen32.cpp b/src/startup/wrapgen/stubgen32.cpp
similarity index 100%
rename from src/dyld/wrapgen/stubgen32.cpp
rename to src/startup/wrapgen/stubgen32.cpp
diff --git a/src/dyld/wrapgen/wrapgen.cpp b/src/startup/wrapgen/wrapgen.cpp
similarity index 100%
rename from src/dyld/wrapgen/wrapgen.cpp
rename to src/startup/wrapgen/wrapgen.cpp