diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2bcce7ac4f2..0f0f7364412 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -430,14 +430,10 @@ ENDIF()
 
 INCLUDE(cmake/abi_check.cmake)
 INCLUDE(cmake/tags.cmake)
-
-
-
-
 INCLUDE(for_clients)
 ADD_SUBDIRECTORY(scripts)
 ADD_SUBDIRECTORY(support-files)
-ADD_SUBDIRECTORY(aws_sdk)
+ADD_SUBDIRECTORY(extra/aws_sdk)
 
 IF(NOT CMAKE_CROSSCOMPILING)
   SET(EXPORTED comp_err comp_sql factorial)
diff --git a/cmake/aws_sdk.cmake b/cmake/aws_sdk.cmake
index 92e1e78ad3f..7abd9974c1e 100644
--- a/cmake/aws_sdk.cmake
+++ b/cmake/aws_sdk.cmake
@@ -35,7 +35,7 @@ FUNCTION (CHECK_AWS_SDK RETVAL REASON)
   IF (NOT(WIN32 OR APPLE  OR (CMAKE_SYSTEM_NAME MATCHES "Linux")))
     SKIP_AWS_SDK("OS unsupported by AWS SDK")
   ENDIF()
-  
+
   # Build from source, using ExternalProject_Add
   # AWS C++ SDK requires cmake 2.8.12
   IF(CMAKE_VERSION VERSION_LESS "2.8.12")
@@ -83,7 +83,7 @@ FUNCTION(USE_AWS_SDK_LIBS)
     TARGET_LINK_LIBRARIES(${target} aws-cpp-sdk-${comp})
   ENDFOREACH()
   TARGET_LINK_LIBRARIES(${target} aws-cpp-sdk-core)
-  TARGET_INCLUDE_DIRECTORIES(${target} PRIVATE ${PROJECT_BINARY_DIR}/aws_sdk/aws_sdk_cpp/include)
+  TARGET_INCLUDE_DIRECTORIES(${target} PRIVATE ${PROJECT_BINARY_DIR}/extra/aws_sdk/aws_sdk_cpp/include)
   # Link OS libraries that AWS SDK depends on
   IF(WIN32)
     TARGET_LINK_LIBRARIES(${target} bcrypt winhttp wininet userenv version)
diff --git a/aws_sdk/CMakeLists.txt b/extra/aws_sdk/CMakeLists.txt
similarity index 100%
rename from aws_sdk/CMakeLists.txt
rename to extra/aws_sdk/CMakeLists.txt