diff --git a/.gitmodules b/.gitmodules
index 085c37b9e..96aa0c6a5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "aws-common-runtime/aws-crt-cpp"]
-	path = aws-common-runtime/aws-crt-cpp
+	path = crt/aws-crt-cpp
 	url = https://github.com/awslabs/aws-crt-cpp.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f511385b0..3af4c8a48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,13 +41,13 @@ if (NOT DEFINED CMAKE_BUILD_TYPE)
 endif()
 
 if (BUILD_DEPS)
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/aws-common-runtime/aws-crt-cpp/aws-common-runtime/aws-c-common/cmake")
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/crt/aws-crt-cpp/crt/aws-c-common/cmake")
 
     include(AwsFindPackage)
     set(IN_SOURCE_BUILD ON)
     set(BUILD_TESTING_PREV ${BUILD_TESTING})
     set(BUILD_TESTING OFF)
-    add_subdirectory(aws-common-runtime/aws-crt-cpp)
+    add_subdirectory(crt/aws-crt-cpp)
     set(BUILD_TESTING ${BUILD_TESTING_PREV})
 else()
     include(AwsFindPackage)
diff --git a/aws-common-runtime/aws-crt-cpp b/aws-common-runtime/aws-crt-cpp
deleted file mode 160000
index 77629186f..000000000
--- a/aws-common-runtime/aws-crt-cpp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 77629186f5d673aa3a1b444167efb0c832e73b51
diff --git a/builder.json b/builder.json
index 052d9a5b8..4046eee5d 100644
--- a/builder.json
+++ b/builder.json
@@ -12,7 +12,7 @@
             ]
         }
     },
-    "search_dirs": ["aws-common-runtime"],
+    "search_dirs": ["crt"],
     "hosts": {
         "manylinux": {
             "architectures": {
diff --git a/crt/aws-crt-cpp b/crt/aws-crt-cpp
new file mode 160000
index 000000000..c80ff383c
--- /dev/null
+++ b/crt/aws-crt-cpp
@@ -0,0 +1 @@
+Subproject commit c80ff383c3eeb6ecde278d8b55cc23bb3e16a39e