diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2469ced..f71d5da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,7 @@ add_definitions(-DSDK_VERSION_STRING="1.4.0")
 set(SDK_TARGET_NAME aws-iot-sdk-cpp)
 if (BUILD_SHARED_LIBRARY)
     add_library(${SDK_TARGET_NAME} SHARED "")
-    set_target_properties(${SDK_TARGET_NAME} PROPERTIES SUFFIX ".so")
+    set_target_properties(${SDK_TARGET_NAME} PROPERTIES VERSION 1.1.0)
 else()
     add_library(${SDK_TARGET_NAME} "")
     set_target_properties(${SDK_TARGET_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
@@ -113,14 +113,14 @@ endif()
 ################################################
 # TODO : Figure out a better way of handling Visual Studio solutions
 if(MSVC)
-	file(GLOB SDK_COMMON_HEADERS "${PROJECT_SOURCE_DIR}/include/*.hpp")
-	file(GLOB SDK_UTIL_COMMON_HEADERS "${PROJECT_SOURCE_DIR}/include/util/*.hpp")
-	file(GLOB SDK_UTIL_LOGGING_HEADERS "${PROJECT_SOURCE_DIR}/include/util/logging/*.hpp")
-	file(GLOB SDK_UTIL_MEMORY_STL_HEADERS "${PROJECT_SOURCE_DIR}/include/util/memory/stl/*.hpp")
-	file(GLOB SDK_UTIL_THREADING_HEADERS "${PROJECT_SOURCE_DIR}/include/util/threading/*.hpp")
-	file(GLOB SDK_MQTT_HEADERS "${PROJECT_SOURCE_DIR}/include/mqtt/*.hpp")
-	file(GLOB SDK_SHADOW_HEADERS "${PROJECT_SOURCE_DIR}/include/shadow/*.hpp")
-	file(GLOB SDK_DISCOVERY_HEADERS "${PROJECT_SOURCE_DIR}/include/discovery/*.hpp")
+	file(GLOB SDK_COMMON_HEADERS "${PROJECT_SOURCE_DIR}/include/awsiotsdk/*.hpp")
+	file(GLOB SDK_UTIL_COMMON_HEADERS "${PROJECT_SOURCE_DIR}/include/awsiotsdk/util/*.hpp")
+	file(GLOB SDK_UTIL_LOGGING_HEADERS "${PROJECT_SOURCE_DIR}/include/awsiotsdk/util/logging/*.hpp")
+	file(GLOB SDK_UTIL_MEMORY_STL_HEADERS "${PROJECT_SOURCE_DIR}/include/awsiotsdk/util/memory/stl/*.hpp")
+	file(GLOB SDK_UTIL_THREADING_HEADERS "${PROJECT_SOURCE_DIR}/include/awsiotsdk/util/threading/*.hpp")
+	file(GLOB SDK_MQTT_HEADERS "${PROJECT_SOURCE_DIR}/include/awsiotsdk/mqtt/*.hpp")
+	file(GLOB SDK_SHADOW_HEADERS "${PROJECT_SOURCE_DIR}/include/awsiotsdk/shadow/*.hpp")
+        file(GLOB SDK_DISCOVERY_HEADERS "${PROJECT_SOURCE_DIR}/include/awsiotsdk/discovery/*.hpp")
 
 	file(GLOB SDK_COMMON_SOURCES "${PROJECT_SOURCE_DIR}/src/*.cpp")
 	file(GLOB SDK_UTIL_COMMON_SOURCES "${PROJECT_SOURCE_DIR}/src/util/*.cpp")
@@ -131,7 +131,7 @@ if(MSVC)
 	file(GLOB SDK_DISCOVERY_SOURCES "${PROJECT_SOURCE_DIR}/src/discovery/*.cpp")
 
 	# Required to make Header files visible in Visual Studio
-	file(GLOB_RECURSE SDKHeaders FOLLOW_SYMLINKS ${PROJECT_SOURCE_DIR}/include/*.hpp)
+	file(GLOB_RECURSE SDKHeaders FOLLOW_SYMLINKS ${PROJECT_SOURCE_DIR}/include/awsiotsdk/*.hpp)
 	target_sources(${SDK_TARGET_NAME} PUBLIC ${SDKHeaders})
 
 	source_group("Header Files\\aws-iot" FILES ${SDK_COMMON_HEADERS})
diff --git a/cli/cli.cpp b/cli/cli.cpp
index 3235fb5..4018153 100644
--- a/cli/cli.cpp
+++ b/cli/cli.cpp
@@ -31,8 +31,8 @@
 #include "OpenSSLConnection.hpp"
 #endif
 
-#include "util/logging/LogMacros.hpp"
-#include "util/JsonParser.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/JsonParser.hpp"
 #include "cli.hpp"
 #include "ConfigCommon.hpp"
 
diff --git a/cli/cli.hpp b/cli/cli.hpp
index 4f3634c..38af032 100644
--- a/cli/cli.hpp
+++ b/cli/cli.hpp
@@ -30,13 +30,13 @@
 #define MAX_PATH_LENGTH_ PATH_MAX
 #endif
 
-#include "NetworkConnection.hpp"
+#include "awsiotsdk/NetworkConnection.hpp"
 
-#include "ResponseCode.hpp"
-#include "ClientCore.hpp"
-#include "mqtt/Client.hpp"
-#include "util/memory/stl/Vector.hpp"
-#include "util/Utf8String.hpp"
+#include "awsiotsdk/ResponseCode.hpp"
+#include "awsiotsdk/ClientCore.hpp"
+#include "awsiotsdk/mqtt/Client.hpp"
+#include "awsiotsdk/util/memory/stl/Vector.hpp"
+#include "awsiotsdk/util/Utf8String.hpp"
 
 using namespace awsiotsdk;
 
diff --git a/common/ConfigCommon.cpp b/common/ConfigCommon.cpp
index 57bf13b..584f5d5 100644
--- a/common/ConfigCommon.cpp
+++ b/common/ConfigCommon.cpp
@@ -29,7 +29,7 @@
 #define MAX_PATH_LENGTH_ PATH_MAX
 #endif
 
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 #include "ConfigCommon.hpp"
 
 #define LOG_TAG_SAMPLE_CONFIG_COMMON "[Sample Config]"
diff --git a/common/ConfigCommon.hpp b/common/ConfigCommon.hpp
index 5a48b7d..a72be2c 100644
--- a/common/ConfigCommon.hpp
+++ b/common/ConfigCommon.hpp
@@ -24,8 +24,8 @@
 
 #include <chrono>
 
-#include "util/memory/stl/String.hpp"
-#include "util/JsonParser.hpp"
+#include "awsiotsdk/util/memory/stl/String.hpp"
+#include "awsiotsdk/util/JsonParser.hpp"
 
 namespace awsiotsdk {
     class ConfigCommon {
diff --git a/include/Action.hpp b/include/awsiotsdk/Action.hpp
similarity index 100%
rename from include/Action.hpp
rename to include/awsiotsdk/Action.hpp
diff --git a/include/ClientCore.hpp b/include/awsiotsdk/ClientCore.hpp
similarity index 100%
rename from include/ClientCore.hpp
rename to include/awsiotsdk/ClientCore.hpp
diff --git a/include/ClientCoreState.hpp b/include/awsiotsdk/ClientCoreState.hpp
similarity index 100%
rename from include/ClientCoreState.hpp
rename to include/awsiotsdk/ClientCoreState.hpp
diff --git a/include/NetworkConnection.hpp b/include/awsiotsdk/NetworkConnection.hpp
similarity index 100%
rename from include/NetworkConnection.hpp
rename to include/awsiotsdk/NetworkConnection.hpp
diff --git a/include/ResponseCode.hpp b/include/awsiotsdk/ResponseCode.hpp
similarity index 100%
rename from include/ResponseCode.hpp
rename to include/awsiotsdk/ResponseCode.hpp
diff --git a/include/discovery/Discovery.hpp b/include/awsiotsdk/discovery/Discovery.hpp
similarity index 98%
rename from include/discovery/Discovery.hpp
rename to include/awsiotsdk/discovery/Discovery.hpp
index 43d1c97..6fa262e 100644
--- a/include/discovery/Discovery.hpp
+++ b/include/awsiotsdk/discovery/Discovery.hpp
@@ -23,11 +23,11 @@
 
 #include <chrono>
 
-#include "util/JsonParser.hpp"
+#include "awsiotsdk/util/JsonParser.hpp"
 
-#include "mqtt/Packet.hpp"
-#include "mqtt/ClientState.hpp"
-#include "discovery/DiscoveryResponse.hpp"
+#include "awsiotsdk/mqtt/Packet.hpp"
+#include "awsiotsdk/mqtt/ClientState.hpp"
+#include "awsiotsdk/discovery/DiscoveryResponse.hpp"
 
 namespace awsiotsdk {
     namespace discovery {
diff --git a/include/discovery/DiscoveryResponse.hpp b/include/awsiotsdk/discovery/DiscoveryResponse.hpp
similarity index 97%
rename from include/discovery/DiscoveryResponse.hpp
rename to include/awsiotsdk/discovery/DiscoveryResponse.hpp
index 3ee1748..db2cc2f 100644
--- a/include/discovery/DiscoveryResponse.hpp
+++ b/include/awsiotsdk/discovery/DiscoveryResponse.hpp
@@ -24,11 +24,11 @@
 
 #include <rapidjson/document.h>
 
-#include "util/memory/stl/String.hpp"
-#include "util/memory/stl/Vector.hpp"
-#include "util/memory/stl/Map.hpp"
+#include "awsiotsdk/util/memory/stl/String.hpp"
+#include "awsiotsdk/util/memory/stl/Vector.hpp"
+#include "awsiotsdk/util/memory/stl/Map.hpp"
 
-#include "util/JsonParser.hpp"
+#include "awsiotsdk/util/JsonParser.hpp"
 
 namespace awsiotsdk {
 
diff --git a/include/jobs/Jobs.hpp b/include/awsiotsdk/jobs/Jobs.hpp
similarity index 99%
rename from include/jobs/Jobs.hpp
rename to include/awsiotsdk/jobs/Jobs.hpp
index 33c2130..7d65ec4 100644
--- a/include/jobs/Jobs.hpp
+++ b/include/awsiotsdk/jobs/Jobs.hpp
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "mqtt/Client.hpp"
+#include "awsiotsdk/mqtt/Client.hpp"
 
 namespace awsiotsdk {
     class Jobs {
diff --git a/include/mqtt/Client.hpp b/include/awsiotsdk/mqtt/Client.hpp
similarity index 98%
rename from include/mqtt/Client.hpp
rename to include/awsiotsdk/mqtt/Client.hpp
index 291b6f4..cd0ac3e 100644
--- a/include/mqtt/Client.hpp
+++ b/include/awsiotsdk/mqtt/Client.hpp
@@ -24,14 +24,14 @@
 
 #pragma once
 
-#include "util/Utf8String.hpp"
+#include "awsiotsdk/util/Utf8String.hpp"
 
-#include "ClientCore.hpp"
+#include "awsiotsdk/ClientCore.hpp"
 
-#include "mqtt/Connect.hpp"
-#include "mqtt/Publish.hpp"
-#include "mqtt/Subscribe.hpp"
-#include "mqtt/ClientState.hpp"
+#include "awsiotsdk/mqtt/Connect.hpp"
+#include "awsiotsdk/mqtt/Publish.hpp"
+#include "awsiotsdk/mqtt/Subscribe.hpp"
+#include "awsiotsdk/mqtt/ClientState.hpp"
 
 namespace awsiotsdk {
 
diff --git a/include/mqtt/ClientState.hpp b/include/awsiotsdk/mqtt/ClientState.hpp
similarity index 96%
rename from include/mqtt/ClientState.hpp
rename to include/awsiotsdk/mqtt/ClientState.hpp
index a6d10d3..c5bff73 100644
--- a/include/mqtt/ClientState.hpp
+++ b/include/awsiotsdk/mqtt/ClientState.hpp
@@ -23,13 +23,13 @@
 
 #include <atomic>
 
-#include "util/Utf8String.hpp"
-#include "util/memory/stl/Map.hpp"
+#include "awsiotsdk/util/Utf8String.hpp"
+#include "awsiotsdk/util/memory/stl/Map.hpp"
 
-#include "Action.hpp"
-#include "ClientCore.hpp"
+#include "awsiotsdk/Action.hpp"
+#include "awsiotsdk/ClientCore.hpp"
 
-#include "mqtt/Common.hpp"
+#include "awsiotsdk/mqtt/Common.hpp"
 
 namespace awsiotsdk {
     namespace mqtt {
diff --git a/include/mqtt/Common.hpp b/include/awsiotsdk/mqtt/Common.hpp
similarity index 99%
rename from include/mqtt/Common.hpp
rename to include/awsiotsdk/mqtt/Common.hpp
index 58d2736..46c715a 100644
--- a/include/mqtt/Common.hpp
+++ b/include/awsiotsdk/mqtt/Common.hpp
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include "util/Utf8String.hpp"
-#include "ResponseCode.hpp"
+#include "awsiotsdk/util/Utf8String.hpp"
+#include "awsiotsdk/ResponseCode.hpp"
 
 #define MAX_TOPICS_IN_ONE_SUBSCRIBE_PACKET 8
 
diff --git a/include/mqtt/Connect.hpp b/include/awsiotsdk/mqtt/Connect.hpp
similarity index 99%
rename from include/mqtt/Connect.hpp
rename to include/awsiotsdk/mqtt/Connect.hpp
index 5b2e2a6..d99d5b0 100644
--- a/include/mqtt/Connect.hpp
+++ b/include/awsiotsdk/mqtt/Connect.hpp
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include "mqtt/ClientState.hpp"
-#include "mqtt/Packet.hpp"
+#include "awsiotsdk/mqtt/ClientState.hpp"
+#include "awsiotsdk/mqtt/Packet.hpp"
 
 namespace awsiotsdk {
     namespace mqtt {
diff --git a/include/mqtt/GreengrassMqttClient.hpp b/include/awsiotsdk/mqtt/GreengrassMqttClient.hpp
similarity index 96%
rename from include/mqtt/GreengrassMqttClient.hpp
rename to include/awsiotsdk/mqtt/GreengrassMqttClient.hpp
index 8b554d4..2165668 100644
--- a/include/mqtt/GreengrassMqttClient.hpp
+++ b/include/awsiotsdk/mqtt/GreengrassMqttClient.hpp
@@ -25,18 +25,18 @@
 
 #pragma once
 
-#include "util/Utf8String.hpp"
-#include "util/JsonParser.hpp"
+#include "awsiotsdk/util/Utf8String.hpp"
+#include "awsiotsdk/util/JsonParser.hpp"
 
-#include "ClientCore.hpp"
+#include "awsiotsdk/ClientCore.hpp"
 
-#include "mqtt/Connect.hpp"
-#include "mqtt/Publish.hpp"
-#include "mqtt/Subscribe.hpp"
-#include "mqtt/ClientState.hpp"
+#include "awsiotsdk/mqtt/Connect.hpp"
+#include "awsiotsdk/mqtt/Publish.hpp"
+#include "awsiotsdk/mqtt/Subscribe.hpp"
+#include "awsiotsdk/mqtt/ClientState.hpp"
 
-#include "discovery/DiscoveryResponse.hpp"
-#include "mqtt/Client.hpp"
+#include "awsiotsdk/discovery/DiscoveryResponse.hpp"
+#include "awsiotsdk/mqtt/Client.hpp"
 
 namespace awsiotsdk {
 
diff --git a/include/mqtt/NetworkRead.hpp b/include/awsiotsdk/mqtt/NetworkRead.hpp
similarity index 98%
rename from include/mqtt/NetworkRead.hpp
rename to include/awsiotsdk/mqtt/NetworkRead.hpp
index 2bc966b..9fec11f 100644
--- a/include/mqtt/NetworkRead.hpp
+++ b/include/awsiotsdk/mqtt/NetworkRead.hpp
@@ -21,10 +21,10 @@
 
 #pragma once
 
-#include "util/memory/stl/Map.hpp"
+#include "awsiotsdk/util/memory/stl/Map.hpp"
 
-#include "ResponseCode.hpp"
-#include "Action.hpp"
+#include "awsiotsdk/ResponseCode.hpp"
+#include "awsiotsdk/Action.hpp"
 #include "Connect.hpp"
 #include "Publish.hpp"
 #include "Subscribe.hpp"
diff --git a/include/mqtt/Packet.hpp b/include/awsiotsdk/mqtt/Packet.hpp
similarity index 96%
rename from include/mqtt/Packet.hpp
rename to include/awsiotsdk/mqtt/Packet.hpp
index c09058c..d4418c7 100644
--- a/include/mqtt/Packet.hpp
+++ b/include/awsiotsdk/mqtt/Packet.hpp
@@ -24,13 +24,13 @@
 #include <iostream>
 #include <memory>
 
-#include "util/Utf8String.hpp"
+#include "awsiotsdk/util/Utf8String.hpp"
 
-#include "Action.hpp"
-#include "ResponseCode.hpp"
-#include "NetworkConnection.hpp"
+#include "awsiotsdk/Action.hpp"
+#include "awsiotsdk/ResponseCode.hpp"
+#include "awsiotsdk/NetworkConnection.hpp"
 
-#include "mqtt/Common.hpp"
+#include "awsiotsdk/mqtt/Common.hpp"
 
 namespace awsiotsdk {
     namespace mqtt {
diff --git a/include/mqtt/Publish.hpp b/include/awsiotsdk/mqtt/Publish.hpp
similarity index 99%
rename from include/mqtt/Publish.hpp
rename to include/awsiotsdk/mqtt/Publish.hpp
index c51058c..26ad501 100644
--- a/include/mqtt/Publish.hpp
+++ b/include/awsiotsdk/mqtt/Publish.hpp
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#include "mqtt/ClientState.hpp"
-#include "mqtt/Packet.hpp"
+#include "awsiotsdk/mqtt/ClientState.hpp"
+#include "awsiotsdk/mqtt/Packet.hpp"
 
 namespace awsiotsdk {
     namespace mqtt {
diff --git a/include/mqtt/Subscribe.hpp b/include/awsiotsdk/mqtt/Subscribe.hpp
similarity index 98%
rename from include/mqtt/Subscribe.hpp
rename to include/awsiotsdk/mqtt/Subscribe.hpp
index 5f43e75..df24e42 100644
--- a/include/mqtt/Subscribe.hpp
+++ b/include/awsiotsdk/mqtt/Subscribe.hpp
@@ -23,11 +23,11 @@
 
 #pragma once
 
-#include "util/Utf8String.hpp"
-#include "util/memory/stl/Map.hpp"
-#include "util/memory/stl/Vector.hpp"
-#include "mqtt/Packet.hpp"
-#include "mqtt/Publish.hpp"
+#include "awsiotsdk/util/Utf8String.hpp"
+#include "awsiotsdk/util/memory/stl/Map.hpp"
+#include "awsiotsdk/util/memory/stl/Vector.hpp"
+#include "awsiotsdk/mqtt/Packet.hpp"
+#include "awsiotsdk/mqtt/Publish.hpp"
 
 namespace awsiotsdk {
     namespace mqtt {
diff --git a/include/shadow/Shadow.hpp b/include/awsiotsdk/shadow/Shadow.hpp
similarity index 98%
rename from include/shadow/Shadow.hpp
rename to include/awsiotsdk/shadow/Shadow.hpp
index f077e23..3b6a9d3 100644
--- a/include/shadow/Shadow.hpp
+++ b/include/awsiotsdk/shadow/Shadow.hpp
@@ -30,11 +30,11 @@
 #include <mutex>
 #include <atomic>
 
-#include "util/memory/stl/String.hpp"
-#include "util/memory/stl/Vector.hpp"
-#include "util/JsonParser.hpp"
+#include "awsiotsdk/util/memory/stl/String.hpp"
+#include "awsiotsdk/util/memory/stl/Vector.hpp"
+#include "awsiotsdk/util/JsonParser.hpp"
 
-#include "mqtt/Client.hpp"
+#include "awsiotsdk/mqtt/Client.hpp"
 
 namespace awsiotsdk {
     /**
diff --git a/include/util/Core_EXPORTS.hpp b/include/awsiotsdk/util/Core_EXPORTS.hpp
similarity index 100%
rename from include/util/Core_EXPORTS.hpp
rename to include/awsiotsdk/util/Core_EXPORTS.hpp
diff --git a/include/util/JsonParser.hpp b/include/awsiotsdk/util/JsonParser.hpp
similarity index 97%
rename from include/util/JsonParser.hpp
rename to include/awsiotsdk/util/JsonParser.hpp
index 47c8864..c3e0be8 100644
--- a/include/util/JsonParser.hpp
+++ b/include/awsiotsdk/util/JsonParser.hpp
@@ -24,8 +24,8 @@
 #include <cstdint>
 #include <rapidjson/document.h>
 
-#include "util/memory/stl/String.hpp"
-#include "ResponseCode.hpp"
+#include "awsiotsdk/util/memory/stl/String.hpp"
+#include "awsiotsdk/ResponseCode.hpp"
 
 #define MAX_CONFIG_FILE_SIZE_BYTES 4096 //Increase if adding more configuration options
 
diff --git a/include/util/Utf8String.hpp b/include/awsiotsdk/util/Utf8String.hpp
similarity index 97%
rename from include/util/Utf8String.hpp
rename to include/awsiotsdk/util/Utf8String.hpp
index 1ab8c95..5f68f20 100644
--- a/include/util/Utf8String.hpp
+++ b/include/awsiotsdk/util/Utf8String.hpp
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <memory>
-#include "util/memory/stl/String.hpp"
+#include "awsiotsdk/util/memory/stl/String.hpp"
 
 namespace awsiotsdk {
     class Utf8String {
diff --git a/include/util/logging/ConsoleLogSystem.hpp b/include/awsiotsdk/util/logging/ConsoleLogSystem.hpp
similarity index 92%
rename from include/util/logging/ConsoleLogSystem.hpp
rename to include/awsiotsdk/util/logging/ConsoleLogSystem.hpp
index da93b5e..9bad025 100644
--- a/include/util/logging/ConsoleLogSystem.hpp
+++ b/include/awsiotsdk/util/logging/ConsoleLogSystem.hpp
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include "util/logging/FormattedLogSystem.hpp"
-#include "util/Core_EXPORTS.hpp"
+#include "awsiotsdk/util/logging/FormattedLogSystem.hpp"
+#include "awsiotsdk/util/Core_EXPORTS.hpp"
 
 namespace awsiotsdk {
     namespace util {
diff --git a/include/util/logging/FormattedLogSystem.hpp b/include/awsiotsdk/util/logging/FormattedLogSystem.hpp
similarity index 95%
rename from include/util/logging/FormattedLogSystem.hpp
rename to include/awsiotsdk/util/logging/FormattedLogSystem.hpp
index 746ae26..96a145b 100644
--- a/include/util/logging/FormattedLogSystem.hpp
+++ b/include/awsiotsdk/util/logging/FormattedLogSystem.hpp
@@ -21,9 +21,9 @@
 
 #pragma once
 
-#include "util/Core_EXPORTS.hpp"
-#include "util/logging/LogSystemInterface.hpp"
-#include "util/logging/LogLevel.hpp"
+#include "awsiotsdk/util/Core_EXPORTS.hpp"
+#include "awsiotsdk/util/logging/LogSystemInterface.hpp"
+#include "awsiotsdk/util/logging/LogLevel.hpp"
 
 #include <atomic>
 
diff --git a/include/util/logging/LogLevel.hpp b/include/awsiotsdk/util/logging/LogLevel.hpp
similarity index 93%
rename from include/util/logging/LogLevel.hpp
rename to include/awsiotsdk/util/logging/LogLevel.hpp
index 7434281..9452777 100644
--- a/include/util/logging/LogLevel.hpp
+++ b/include/awsiotsdk/util/logging/LogLevel.hpp
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include "util/Core_EXPORTS.hpp"
-#include "util/memory/stl/String.hpp"
+#include "awsiotsdk/util/Core_EXPORTS.hpp"
+#include "awsiotsdk/util/memory/stl/String.hpp"
 
 namespace awsiotsdk {
     namespace util {
diff --git a/include/util/logging/LogMacros.hpp b/include/awsiotsdk/util/logging/LogMacros.hpp
similarity index 97%
rename from include/util/logging/LogMacros.hpp
rename to include/awsiotsdk/util/logging/LogMacros.hpp
index ee618f5..63e436a 100644
--- a/include/util/logging/LogMacros.hpp
+++ b/include/awsiotsdk/util/logging/LogMacros.hpp
@@ -20,12 +20,12 @@
 
 #pragma once
 
-#include "util/Core_EXPORTS.hpp"
+#include "awsiotsdk/util/Core_EXPORTS.hpp"
 
-#include "util/logging/LogLevel.hpp"
-#include "util/logging/Logging.hpp"
-#include "util/logging/LogSystemInterface.hpp"
-#include "util/memory/stl/StringStream.hpp"
+#include "awsiotsdk/util/logging/LogLevel.hpp"
+#include "awsiotsdk/util/logging/Logging.hpp"
+#include "awsiotsdk/util/logging/LogSystemInterface.hpp"
+#include "awsiotsdk/util/memory/stl/StringStream.hpp"
 
 // While macros are usually grotty, using them here lets us have a simple function call interface for logging that
 //
diff --git a/include/util/logging/LogSystemInterface.hpp b/include/awsiotsdk/util/logging/LogSystemInterface.hpp
similarity index 93%
rename from include/util/logging/LogSystemInterface.hpp
rename to include/awsiotsdk/util/logging/LogSystemInterface.hpp
index 8188659..f4107fb 100644
--- a/include/util/logging/LogSystemInterface.hpp
+++ b/include/awsiotsdk/util/logging/LogSystemInterface.hpp
@@ -21,9 +21,9 @@
 
 #pragma once
 
-#include "util/Core_EXPORTS.hpp"
-#include "util/memory/stl/String.hpp"
-#include "util/memory/stl/StringStream.hpp"
+#include "awsiotsdk/util/Core_EXPORTS.hpp"
+#include "awsiotsdk/util/memory/stl/String.hpp"
+#include "awsiotsdk/util/memory/stl/StringStream.hpp"
 
 namespace awsiotsdk {
     namespace util {
diff --git a/include/util/logging/Logging.hpp b/include/awsiotsdk/util/logging/Logging.hpp
similarity index 97%
rename from include/util/logging/Logging.hpp
rename to include/awsiotsdk/util/logging/Logging.hpp
index db55737..16c8365 100644
--- a/include/util/logging/Logging.hpp
+++ b/include/awsiotsdk/util/logging/Logging.hpp
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <memory>
-#include "util/Core_EXPORTS.hpp"
+#include "awsiotsdk/util/Core_EXPORTS.hpp"
 
 namespace awsiotsdk {
     namespace util {
diff --git a/include/util/memory/stl/Map.hpp b/include/awsiotsdk/util/memory/stl/Map.hpp
similarity index 100%
rename from include/util/memory/stl/Map.hpp
rename to include/awsiotsdk/util/memory/stl/Map.hpp
diff --git a/include/util/memory/stl/Queue.hpp b/include/awsiotsdk/util/memory/stl/Queue.hpp
similarity index 95%
rename from include/util/memory/stl/Queue.hpp
rename to include/awsiotsdk/util/memory/stl/Queue.hpp
index 6df1af4..4394c60 100644
--- a/include/util/memory/stl/Queue.hpp
+++ b/include/awsiotsdk/util/memory/stl/Queue.hpp
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "util/Core_EXPORTS.hpp"
+#include "awsiotsdk/util/Core_EXPORTS.hpp"
 
 #include <deque>
 #include <queue>
diff --git a/include/util/memory/stl/String.hpp b/include/awsiotsdk/util/memory/stl/String.hpp
similarity index 95%
rename from include/util/memory/stl/String.hpp
rename to include/awsiotsdk/util/memory/stl/String.hpp
index 95b8ed3..e6f436a 100644
--- a/include/util/memory/stl/String.hpp
+++ b/include/awsiotsdk/util/memory/stl/String.hpp
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "util/Core_EXPORTS.hpp"
+#include "awsiotsdk/util/Core_EXPORTS.hpp"
 #include <functional>
 #include <string>
 
diff --git a/include/util/memory/stl/StringStream.hpp b/include/awsiotsdk/util/memory/stl/StringStream.hpp
similarity index 96%
rename from include/util/memory/stl/StringStream.hpp
rename to include/awsiotsdk/util/memory/stl/StringStream.hpp
index 40679d1..c71db28 100644
--- a/include/util/memory/stl/StringStream.hpp
+++ b/include/awsiotsdk/util/memory/stl/StringStream.hpp
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "util/Core_EXPORTS.hpp"
+#include "awsiotsdk/util/Core_EXPORTS.hpp"
 
 #include <sstream>
 
diff --git a/include/util/memory/stl/Vector.hpp b/include/awsiotsdk/util/memory/stl/Vector.hpp
similarity index 94%
rename from include/util/memory/stl/Vector.hpp
rename to include/awsiotsdk/util/memory/stl/Vector.hpp
index b80244a..e141349 100644
--- a/include/util/memory/stl/Vector.hpp
+++ b/include/awsiotsdk/util/memory/stl/Vector.hpp
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "util/Core_EXPORTS.hpp"
+#include "awsiotsdk/util/Core_EXPORTS.hpp"
 #include <vector>
 
 namespace awsiotsdk {
diff --git a/include/util/threading/ThreadTask.hpp b/include/awsiotsdk/util/threading/ThreadTask.hpp
similarity index 91%
rename from include/util/threading/ThreadTask.hpp
rename to include/awsiotsdk/util/threading/ThreadTask.hpp
index 50679b8..533bde9 100644
--- a/include/util/threading/ThreadTask.hpp
+++ b/include/awsiotsdk/util/threading/ThreadTask.hpp
@@ -25,10 +25,10 @@
 #include <thread>
 #include <atomic>
 
-#include "util/Core_EXPORTS.hpp"
+#include "awsiotsdk/util/Core_EXPORTS.hpp"
 
-#include "NetworkConnection.hpp"
-#include "Action.hpp"
+#include "awsiotsdk/NetworkConnection.hpp"
+#include "awsiotsdk/Action.hpp"
 
 namespace awsiotsdk {
     namespace util {
diff --git a/network/OpenSSL/OpenSSLConnection.cpp b/network/OpenSSL/OpenSSLConnection.cpp
index 23e9460..27e75f7 100644
--- a/network/OpenSSL/OpenSSLConnection.cpp
+++ b/network/OpenSSL/OpenSSLConnection.cpp
@@ -20,10 +20,10 @@
  */
 
 #include <iostream>
-#include <util/memory/stl/Vector.hpp>
+#include <awsiotsdk/util/memory/stl/Vector.hpp>
 
 #include "OpenSSLConnection.hpp"
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
 #ifdef WIN32
 #define MAX_PATH_LENGTH_ 260
diff --git a/network/OpenSSL/OpenSSLConnection.hpp b/network/OpenSSL/OpenSSLConnection.hpp
index b4f20a1..5b29357 100644
--- a/network/OpenSSL/OpenSSLConnection.hpp
+++ b/network/OpenSSL/OpenSSLConnection.hpp
@@ -45,8 +45,8 @@
 #include <openssl/x509_vfy.h>
 #include <string.h>
 
-#include "NetworkConnection.hpp"
-#include "ResponseCode.hpp"
+#include "awsiotsdk/NetworkConnection.hpp"
+#include "awsiotsdk/ResponseCode.hpp"
 
 namespace awsiotsdk {
     namespace network {
diff --git a/samples/Jobs/JobsSample.cpp b/samples/Jobs/JobsSample.cpp
index a1f032c..0d7caf2 100644
--- a/samples/Jobs/JobsSample.cpp
+++ b/samples/Jobs/JobsSample.cpp
@@ -42,12 +42,12 @@
 #include "OpenSSLConnection.hpp"
 #endif
 
-#include "util/logging/Logging.hpp"
-#include "util/logging/LogMacros.hpp"
-#include "util/logging/ConsoleLogSystem.hpp"
+#include "awsiotsdk/util/logging/Logging.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/ConsoleLogSystem.hpp"
 
 #include "ConfigCommon.hpp"
-#include "jobs/Jobs.hpp"
+#include "awsiotsdk/jobs/Jobs.hpp"
 #include "JobsSample.hpp"
 
 #define LOG_TAG_JOBS "[Sample - Jobs]"
diff --git a/samples/Jobs/JobsSample.hpp b/samples/Jobs/JobsSample.hpp
index 8080b61..6d0599d 100644
--- a/samples/Jobs/JobsSample.hpp
+++ b/samples/Jobs/JobsSample.hpp
@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "mqtt/Client.hpp"
-#include "NetworkConnection.hpp"
+#include "awsiotsdk/mqtt/Client.hpp"
+#include "awsiotsdk/NetworkConnection.hpp"
 
 namespace awsiotsdk {
     namespace samples {
diff --git a/samples/PubSub/PubSub.cpp b/samples/PubSub/PubSub.cpp
index 651aa19..c591fe7 100644
--- a/samples/PubSub/PubSub.cpp
+++ b/samples/PubSub/PubSub.cpp
@@ -30,9 +30,9 @@
 #include "OpenSSLConnection.hpp"
 #endif
 
-#include "util/logging/Logging.hpp"
-#include "util/logging/LogMacros.hpp"
-#include "util/logging/ConsoleLogSystem.hpp"
+#include "awsiotsdk/util/logging/Logging.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/ConsoleLogSystem.hpp"
 
 #include "ConfigCommon.hpp"
 #include "PubSub.hpp"
diff --git a/samples/PubSub/PubSub.hpp b/samples/PubSub/PubSub.hpp
index 3840032..b1f9bdc 100644
--- a/samples/PubSub/PubSub.hpp
+++ b/samples/PubSub/PubSub.hpp
@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "mqtt/Client.hpp"
-#include "NetworkConnection.hpp"
+#include "awsiotsdk/mqtt/Client.hpp"
+#include "awsiotsdk/NetworkConnection.hpp"
 
 namespace awsiotsdk {
     namespace samples {
diff --git a/samples/ShadowDelta/ShadowDelta.cpp b/samples/ShadowDelta/ShadowDelta.cpp
index 85940e4..8c45ed9 100644
--- a/samples/ShadowDelta/ShadowDelta.cpp
+++ b/samples/ShadowDelta/ShadowDelta.cpp
@@ -30,9 +30,9 @@
 #include "OpenSSLConnection.hpp"
 #endif
 
-#include "util/logging/Logging.hpp"
-#include "util/logging/LogMacros.hpp"
-#include "util/logging/ConsoleLogSystem.hpp"
+#include "awsiotsdk/util/logging/Logging.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/ConsoleLogSystem.hpp"
 
 #include "ConfigCommon.hpp"
 #include "ShadowDelta.hpp"
diff --git a/samples/ShadowDelta/ShadowDelta.hpp b/samples/ShadowDelta/ShadowDelta.hpp
index db3883d..b7833ca 100644
--- a/samples/ShadowDelta/ShadowDelta.hpp
+++ b/samples/ShadowDelta/ShadowDelta.hpp
@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "mqtt/Client.hpp"
-#include "NetworkConnection.hpp"
-#include "shadow/Shadow.hpp"
+#include "awsiotsdk/mqtt/Client.hpp"
+#include "awsiotsdk/NetworkConnection.hpp"
+#include "awsiotsdk/shadow/Shadow.hpp"
 
 namespace awsiotsdk {
     namespace samples {
diff --git a/src/Action.cpp b/src/Action.cpp
index 0c68b55..6d5711c 100644
--- a/src/Action.cpp
+++ b/src/Action.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "Action.hpp"
+#include "awsiotsdk/Action.hpp"
 
 namespace awsiotsdk {
     Action::Action(ActionType action_type, util::String action_info_string) {
diff --git a/src/ClientCore.cpp b/src/ClientCore.cpp
index cfd1a9b..c902517 100644
--- a/src/ClientCore.cpp
+++ b/src/ClientCore.cpp
@@ -20,8 +20,8 @@
 
 #include <iostream>
 
-#include "util/logging/LogMacros.hpp"
-#include "ClientCore.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
+#include "awsiotsdk/ClientCore.hpp"
 
 #define LOG_TAG_CLIENT_CORE "[Client Core]"
 
diff --git a/src/ClientCoreState.cpp b/src/ClientCoreState.cpp
index f13eefd..e16c29c 100644
--- a/src/ClientCoreState.cpp
+++ b/src/ClientCoreState.cpp
@@ -19,9 +19,9 @@
  *
  */
 
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
-#include "ClientCoreState.hpp"
+#include "awsiotsdk/ClientCoreState.hpp"
 
 #ifndef MAX_CORE_ACTION_PROCESSING_RATE_HZ
 #define MAX_CORE_ACTION_PROCESSING_RATE_HZ 5
diff --git a/src/NetworkConnection.cpp b/src/NetworkConnection.cpp
index a967fb0..2be7d18 100644
--- a/src/NetworkConnection.cpp
+++ b/src/NetworkConnection.cpp
@@ -22,8 +22,8 @@
  *
  */
 
-#include "util/memory/stl/String.hpp"
-#include "NetworkConnection.hpp"
+#include "awsiotsdk/util/memory/stl/String.hpp"
+#include "awsiotsdk/NetworkConnection.hpp"
 
 namespace awsiotsdk {
     ResponseCode NetworkConnection::Connect() {
diff --git a/src/ResponseCode.cpp b/src/ResponseCode.cpp
index fad8420..6c0229e 100644
--- a/src/ResponseCode.cpp
+++ b/src/ResponseCode.cpp
@@ -21,8 +21,8 @@
  *
  */
 
-#include "ResponseCode.hpp"
-#include "util/logging/LogSystemInterface.hpp"
+#include "awsiotsdk/ResponseCode.hpp"
+#include "awsiotsdk/util/logging/LogSystemInterface.hpp"
 #include <iostream>
 
 namespace awsiotsdk {
diff --git a/src/discovery/Discovery.cpp b/src/discovery/Discovery.cpp
index 1c60a72..f245b76 100644
--- a/src/discovery/Discovery.cpp
+++ b/src/discovery/Discovery.cpp
@@ -19,9 +19,9 @@
  *
  */
 
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
-#include "discovery/Discovery.hpp"
+#include "awsiotsdk/discovery/Discovery.hpp"
 
 #define DISCOVER_ACTION_DESCRIPTION "AWS Greengrass Discover Action"
 
diff --git a/src/discovery/DiscoveryResponse.cpp b/src/discovery/DiscoveryResponse.cpp
index fa56e50..52dd2a8 100644
--- a/src/discovery/DiscoveryResponse.cpp
+++ b/src/discovery/DiscoveryResponse.cpp
@@ -19,11 +19,11 @@
  *
  */
 
-#include "util/logging/Logging.hpp"
-#include "util/logging/LogMacros.hpp"
-#include "util/logging/ConsoleLogSystem.hpp"
+#include "awsiotsdk/util/logging/Logging.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/ConsoleLogSystem.hpp"
 
-#include "discovery/DiscoveryResponse.hpp"
+#include "awsiotsdk/discovery/DiscoveryResponse.hpp"
 
 #define LOG_TAG_DISCOVERY_RESPONSE "[Discovery Response]"
 
diff --git a/src/jobs/Jobs.cpp b/src/jobs/Jobs.cpp
index 902ec91..790dde7 100644
--- a/src/jobs/Jobs.cpp
+++ b/src/jobs/Jobs.cpp
@@ -19,9 +19,9 @@
  *
  */
 
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
-#include "jobs/Jobs.hpp"
+#include "awsiotsdk/jobs/Jobs.hpp"
 
 #define BASE_THINGS_TOPIC "$aws/things/"
 
diff --git a/src/mqtt/Client.cpp b/src/mqtt/Client.cpp
index bd28175..fede1d3 100644
--- a/src/mqtt/Client.cpp
+++ b/src/mqtt/Client.cpp
@@ -19,11 +19,11 @@
  *
  */
 
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
-#include "ResponseCode.hpp"
-#include "mqtt/Client.hpp"
-#include "mqtt/NetworkRead.hpp"
+#include "awsiotsdk/ResponseCode.hpp"
+#include "awsiotsdk/mqtt/Client.hpp"
+#include "awsiotsdk/mqtt/NetworkRead.hpp"
 
 #define MQTT_ACTION_TIMEOUT_MS 2000
 
diff --git a/src/mqtt/ClientState.cpp b/src/mqtt/ClientState.cpp
index b5fea1a..67ffc94 100644
--- a/src/mqtt/ClientState.cpp
+++ b/src/mqtt/ClientState.cpp
@@ -21,7 +21,7 @@
 
 #include <regex>
 
-#include "mqtt/ClientState.hpp"
+#include "awsiotsdk/mqtt/ClientState.hpp"
 
 #define MIN_RECONNECT_BACKOFF_DEFAULT_SEC 1
 #define MAX_RECONNECT_BACKOFF_DEFAULT_SEC 128
diff --git a/src/mqtt/Common.cpp b/src/mqtt/Common.cpp
index 4d4c947..f3d17e5 100644
--- a/src/mqtt/Common.cpp
+++ b/src/mqtt/Common.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "mqtt/Common.hpp"
+#include "awsiotsdk/mqtt/Common.hpp"
 #include <iostream>
 
 #define SINGLE_LEVEL_WILDCARD '+'
diff --git a/src/mqtt/Connect.cpp b/src/mqtt/Connect.cpp
index 2206a1d..5698528 100644
--- a/src/mqtt/Connect.cpp
+++ b/src/mqtt/Connect.cpp
@@ -19,11 +19,11 @@
  *
  */
 
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
-#include "mqtt/ClientState.hpp"
-#include "mqtt/NetworkRead.hpp"
-#include "mqtt/Connect.hpp"
+#include "awsiotsdk/mqtt/ClientState.hpp"
+#include "awsiotsdk/mqtt/NetworkRead.hpp"
+#include "awsiotsdk/mqtt/Connect.hpp"
 
 #define CONNECT_ACTION_DESCRIPTION "MQTT Connect Action"
 #define DISCONNECT_ACTION_DESCRIPTION "MQTT Disconnect Action"
diff --git a/src/mqtt/GreengrassMqttClient.cpp b/src/mqtt/GreengrassMqttClient.cpp
index 0233c0c..59e7cb9 100644
--- a/src/mqtt/GreengrassMqttClient.cpp
+++ b/src/mqtt/GreengrassMqttClient.cpp
@@ -19,13 +19,13 @@
  *
  */
 
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
-#include "ResponseCode.hpp"
-#include "mqtt/GreengrassMqttClient.hpp"
-#include "mqtt/NetworkRead.hpp"
+#include "awsiotsdk/ResponseCode.hpp"
+#include "awsiotsdk/mqtt/GreengrassMqttClient.hpp"
+#include "awsiotsdk/mqtt/NetworkRead.hpp"
 
-#include "discovery/Discovery.hpp"
+#include "awsiotsdk/discovery/Discovery.hpp"
 
 #define MQTT_ACTION_TIMEOUT_MS 2000
 
diff --git a/src/mqtt/NetworkRead.cpp b/src/mqtt/NetworkRead.cpp
index bd36d4c..a810978 100644
--- a/src/mqtt/NetworkRead.cpp
+++ b/src/mqtt/NetworkRead.cpp
@@ -23,10 +23,10 @@
 #include <chrono>
 #include <thread>
 
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
-#include "mqtt/ClientState.hpp"
-#include "mqtt/NetworkRead.hpp"
+#include "awsiotsdk/mqtt/ClientState.hpp"
+#include "awsiotsdk/mqtt/NetworkRead.hpp"
 
 #define MAX_NO_OF_REMAINING_LENGTH_BYTES 4
 
diff --git a/src/mqtt/Packet.cpp b/src/mqtt/Packet.cpp
index a692a58..071aaa7 100644
--- a/src/mqtt/Packet.cpp
+++ b/src/mqtt/Packet.cpp
@@ -21,8 +21,8 @@
 
 #include <algorithm>
 
-#include "ResponseCode.hpp"
-#include "mqtt/Packet.hpp"
+#include "awsiotsdk/ResponseCode.hpp"
+#include "awsiotsdk/mqtt/Packet.hpp"
 #include <cstdio>
 
 #define MAX_MQTT_PACKET_REM_LEN_BYTES 268435455
diff --git a/src/mqtt/Publish.cpp b/src/mqtt/Publish.cpp
index 3baab37..a8199a1 100644
--- a/src/mqtt/Publish.cpp
+++ b/src/mqtt/Publish.cpp
@@ -21,10 +21,10 @@
  * Also defines the packet types used by these actions.
  */
 
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
-#include "mqtt/ClientState.hpp"
-#include "mqtt/Publish.hpp"
+#include "awsiotsdk/mqtt/ClientState.hpp"
+#include "awsiotsdk/mqtt/Publish.hpp"
 
 #define PUBLISH_ACTION_DESCRIPTION "MQTT Publish Action"
 #define PUBACK_ACTION_DESCRIPTION "MQTT Puback Action"
diff --git a/src/mqtt/Subscribe.cpp b/src/mqtt/Subscribe.cpp
index 8df0a76..705c532 100644
--- a/src/mqtt/Subscribe.cpp
+++ b/src/mqtt/Subscribe.cpp
@@ -21,11 +21,11 @@
  * Also defines the packet types used by these actions as well as the related Ack packet types.
  */
 
-#include "util/logging/LogMacros.hpp"
-#include "util/memory/stl/Vector.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/memory/stl/Vector.hpp"
 
-#include "mqtt/ClientState.hpp"
-#include "mqtt/Subscribe.hpp"
+#include "awsiotsdk/mqtt/ClientState.hpp"
+#include "awsiotsdk/mqtt/Subscribe.hpp"
 
 #define SUBSCRIBE_ACTION_DESCRIPTION "MQTT Subscribe Action"
 #define UNSUBSCRIBE_ACTION_DESCRIPTION "MQTT Unsubscribe Action"
diff --git a/src/shadow/Shadow.cpp b/src/shadow/Shadow.cpp
index 9c0cd5d..0446353 100644
--- a/src/shadow/Shadow.cpp
+++ b/src/shadow/Shadow.cpp
@@ -22,8 +22,8 @@
 
 #include <chrono>
 
-#include "shadow/Shadow.hpp"
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/shadow/Shadow.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
 #define SUBSCRIPTION_SETTING_TIME_SECS 2
 
diff --git a/src/util/JsonParser.cpp b/src/util/JsonParser.cpp
index 6e1b03e..687aa03 100644
--- a/src/util/JsonParser.cpp
+++ b/src/util/JsonParser.cpp
@@ -27,7 +27,7 @@
 #include <iostream>
 #include <memory>
 
-#include "util/JsonParser.hpp"
+#include "awsiotsdk/util/JsonParser.hpp"
 
 namespace awsiotsdk {
     namespace util {
diff --git a/src/util/Utf8String.cpp b/src/util/Utf8String.cpp
index 17d7428..13fe2cc 100644
--- a/src/util/Utf8String.cpp
+++ b/src/util/Utf8String.cpp
@@ -22,7 +22,7 @@
 #include <rapidjson/encodings.h>
 #include <rapidjson/stream.h>
 #include <rapidjson/stringbuffer.h>
-#include "util/Utf8String.hpp"
+#include "awsiotsdk/util/Utf8String.hpp"
 
 namespace awsiotsdk {
     namespace utf8 {
diff --git a/src/util/logging/ConsoleLogSystem.cpp b/src/util/logging/ConsoleLogSystem.cpp
index f85715f..8549da0 100644
--- a/src/util/logging/ConsoleLogSystem.cpp
+++ b/src/util/logging/ConsoleLogSystem.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "util/logging/ConsoleLogSystem.hpp"
+#include "awsiotsdk/util/logging/ConsoleLogSystem.hpp"
 
 #include <iostream>
 
diff --git a/src/util/logging/FormattedLogSystem.cpp b/src/util/logging/FormattedLogSystem.cpp
index fb0d1d0..af2f85f 100644
--- a/src/util/logging/FormattedLogSystem.cpp
+++ b/src/util/logging/FormattedLogSystem.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "util/logging/FormattedLogSystem.hpp"
+#include "awsiotsdk/util/logging/FormattedLogSystem.hpp"
 
 #include <chrono>
 #include <fstream>
diff --git a/src/util/logging/LogLevel.cpp b/src/util/logging/LogLevel.cpp
index a3ca00d..edddadf 100644
--- a/src/util/logging/LogLevel.cpp
+++ b/src/util/logging/LogLevel.cpp
@@ -19,9 +19,9 @@
  *
  */
 
-#include "util/logging/LogLevel.hpp"
+#include "awsiotsdk/util/logging/LogLevel.hpp"
 
-#include "util/memory/stl/String.hpp"
+#include "awsiotsdk/util/memory/stl/String.hpp"
 #include <cassert>
 
 using namespace awsiotsdk::util::Logging;
diff --git a/src/util/logging/Logging.cpp b/src/util/logging/Logging.cpp
index 7078325..284b194 100644
--- a/src/util/logging/Logging.cpp
+++ b/src/util/logging/Logging.cpp
@@ -19,8 +19,8 @@
  *
  */
 
-#include "util/logging/Logging.hpp"
-#include "util/logging/LogSystemInterface.hpp"
+#include "awsiotsdk/util/logging/Logging.hpp"
+#include "awsiotsdk/util/logging/LogSystemInterface.hpp"
 
 #include <memory>
 
diff --git a/src/util/threading/ThreadTask.cpp b/src/util/threading/ThreadTask.cpp
index 3698ac0..9fdf7d2 100644
--- a/src/util/threading/ThreadTask.cpp
+++ b/src/util/threading/ThreadTask.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "util/threading/ThreadTask.hpp"
+#include "awsiotsdk/util/threading/ThreadTask.hpp"
 
 namespace awsiotsdk {
     namespace util {
diff --git a/tests/integration/include/AutoReconnect.hpp b/tests/integration/include/AutoReconnect.hpp
index 6bbb6e9..0c231b1 100644
--- a/tests/integration/include/AutoReconnect.hpp
+++ b/tests/integration/include/AutoReconnect.hpp
@@ -23,7 +23,7 @@
 #pragma once
 
 #include <mutex>
-#include "mqtt/Client.hpp"
+#include "awsiotsdk/mqtt/Client.hpp"
 
 namespace awsiotsdk {
     namespace tests {
diff --git a/tests/integration/include/IntegTestRunner.hpp b/tests/integration/include/IntegTestRunner.hpp
index 39ed92c..f6bc847 100644
--- a/tests/integration/include/IntegTestRunner.hpp
+++ b/tests/integration/include/IntegTestRunner.hpp
@@ -25,7 +25,7 @@
 #include <cstring>
 #include <chrono>
 
-#include "ResponseCode.hpp"
+#include "awsiotsdk/ResponseCode.hpp"
 
 namespace awsiotsdk {
     namespace tests {
diff --git a/tests/integration/include/JobsTest.hpp b/tests/integration/include/JobsTest.hpp
index e958fb7..ddc5721 100644
--- a/tests/integration/include/JobsTest.hpp
+++ b/tests/integration/include/JobsTest.hpp
@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "mqtt/Client.hpp"
-#include "NetworkConnection.hpp"
-#include "jobs/Jobs.hpp"
+#include "awsiotsdk/mqtt/Client.hpp"
+#include "awsiotsdk/NetworkConnection.hpp"
+#include "awsiotsdk/jobs/Jobs.hpp"
 
 namespace awsiotsdk {
     namespace tests {
diff --git a/tests/integration/include/MultipleClients.hpp b/tests/integration/include/MultipleClients.hpp
index 2cd9ab8..4ec859c 100644
--- a/tests/integration/include/MultipleClients.hpp
+++ b/tests/integration/include/MultipleClients.hpp
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "mqtt/Client.hpp"
+#include "awsiotsdk/mqtt/Client.hpp"
 
 namespace awsiotsdk {
     namespace tests {
diff --git a/tests/integration/include/MultipleSubAutoReconnect.hpp b/tests/integration/include/MultipleSubAutoReconnect.hpp
index 4d01800..491b64f 100644
--- a/tests/integration/include/MultipleSubAutoReconnect.hpp
+++ b/tests/integration/include/MultipleSubAutoReconnect.hpp
@@ -23,7 +23,7 @@
 #pragma once
 
 #include <mutex>
-#include "mqtt/Client.hpp"
+#include "awsiotsdk/mqtt/Client.hpp"
 
 namespace awsiotsdk {
     namespace tests {
diff --git a/tests/integration/include/PubSub.hpp b/tests/integration/include/PubSub.hpp
index 79be5ee..484406d 100644
--- a/tests/integration/include/PubSub.hpp
+++ b/tests/integration/include/PubSub.hpp
@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "mqtt/Client.hpp"
-#include "NetworkConnection.hpp"
+#include "awsiotsdk/mqtt/Client.hpp"
+#include "awsiotsdk/NetworkConnection.hpp"
 
 namespace awsiotsdk {
     namespace tests {
diff --git a/tests/integration/include/SdkTestConfig.hpp b/tests/integration/include/SdkTestConfig.hpp
index 3e0086a..a72b038 100644
--- a/tests/integration/include/SdkTestConfig.hpp
+++ b/tests/integration/include/SdkTestConfig.hpp
@@ -28,7 +28,7 @@
 #include <rapidjson/stringbuffer.h>
 #include <rapidjson/writer.h>
 
-#include "ResponseCode.hpp"
+#include "awsiotsdk/ResponseCode.hpp"
 
 // Network settings
 #define SDK_CONFIG_ENDPOINT_KEY "endpoint"
diff --git a/tests/integration/src/AutoReconnect.cpp b/tests/integration/src/AutoReconnect.cpp
index 035e6fb..0b59a53 100644
--- a/tests/integration/src/AutoReconnect.cpp
+++ b/tests/integration/src/AutoReconnect.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "AutoReconnect.hpp"
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
 #include <cstring>
 #include <chrono>
diff --git a/tests/integration/src/IntegTestRunner.cpp b/tests/integration/src/IntegTestRunner.cpp
index 73eef3b..82f1ff7 100644
--- a/tests/integration/src/IntegTestRunner.cpp
+++ b/tests/integration/src/IntegTestRunner.cpp
@@ -19,11 +19,11 @@
  *
  */
 
-#include "util/memory/stl/String.hpp"
+#include "awsiotsdk/util/memory/stl/String.hpp"
 
-#include "util/logging/Logging.hpp"
-#include "util/logging/LogMacros.hpp"
-#include "util/logging/ConsoleLogSystem.hpp"
+#include "awsiotsdk/util/logging/Logging.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/ConsoleLogSystem.hpp"
 
 #include "ConfigCommon.hpp"
 #include "IntegTestRunner.hpp"
diff --git a/tests/integration/src/JobsTest.cpp b/tests/integration/src/JobsTest.cpp
index 3e913df..f1569cb 100644
--- a/tests/integration/src/JobsTest.cpp
+++ b/tests/integration/src/JobsTest.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "JobsTest.hpp"
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
 #include <cstring>
 #include <chrono>
diff --git a/tests/integration/src/MultipleClients.cpp b/tests/integration/src/MultipleClients.cpp
index 660cd5a..e30315f 100644
--- a/tests/integration/src/MultipleClients.cpp
+++ b/tests/integration/src/MultipleClients.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "MultipleClients.hpp"
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
 #include <cstring>
 #include <chrono>
diff --git a/tests/integration/src/MultipleSubAutoReconnect.cpp b/tests/integration/src/MultipleSubAutoReconnect.cpp
index b45763f..baaa17c 100644
--- a/tests/integration/src/MultipleSubAutoReconnect.cpp
+++ b/tests/integration/src/MultipleSubAutoReconnect.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "MultipleSubAutoReconnect.hpp"
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
 #include <cstring>
 #include <chrono>
diff --git a/tests/integration/src/PubSub.cpp b/tests/integration/src/PubSub.cpp
index d9c230f..b1914b6 100644
--- a/tests/integration/src/PubSub.cpp
+++ b/tests/integration/src/PubSub.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "PubSub.hpp"
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
 #include <cstring>
 #include <chrono>
diff --git a/tests/integration/src/SdkTestConfig.cpp b/tests/integration/src/SdkTestConfig.cpp
index b84f76c..50332d2 100644
--- a/tests/integration/src/SdkTestConfig.cpp
+++ b/tests/integration/src/SdkTestConfig.cpp
@@ -21,7 +21,7 @@
 
 #include <rapidjson/filereadstream.h>
 
-#include "util/JsonParser.hpp"
+#include "awsiotsdk/util/JsonParser.hpp"
 #include "SdkTestConfig.hpp"
 
 namespace awsiotsdk {
diff --git a/tests/unit/include/MockNetworkConnection.hpp b/tests/unit/include/MockNetworkConnection.hpp
index 55d38a0..4426db8 100644
--- a/tests/unit/include/MockNetworkConnection.hpp
+++ b/tests/unit/include/MockNetworkConnection.hpp
@@ -30,8 +30,8 @@
 #include <gmock/gmock.h>
 
 #include "TestHelper.hpp"
-#include "ResponseCode.hpp"
-#include "NetworkConnection.hpp"
+#include "awsiotsdk/ResponseCode.hpp"
+#include "awsiotsdk/NetworkConnection.hpp"
 
 namespace awsiotsdk {
     namespace tests {
diff --git a/tests/unit/include/TestHelper.hpp b/tests/unit/include/TestHelper.hpp
index 301d190..3e7a8ce 100644
--- a/tests/unit/include/TestHelper.hpp
+++ b/tests/unit/include/TestHelper.hpp
@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "util/Utf8String.hpp"
+#include "awsiotsdk/util/Utf8String.hpp"
 
-#include "mqtt/Client.hpp"
+#include "awsiotsdk/mqtt/Client.hpp"
 
 #define MAX_NO_OF_REMAINING_LENGTH_BYTES 4
 
diff --git a/tests/unit/src/ClientCoreTests.cpp b/tests/unit/src/ClientCoreTests.cpp
index 8d3e62c..6c5b976 100644
--- a/tests/unit/src/ClientCoreTests.cpp
+++ b/tests/unit/src/ClientCoreTests.cpp
@@ -24,7 +24,7 @@
 
 #include "MockNetworkConnection.hpp"
 
-#include "ClientCore.hpp"
+#include "awsiotsdk/ClientCore.hpp"
 
 namespace awsiotsdk {
     namespace tests {
diff --git a/tests/unit/src/ConfigCommonTests.cpp b/tests/unit/src/ConfigCommonTests.cpp
index 65cee5a..7baa3f0 100644
--- a/tests/unit/src/ConfigCommonTests.cpp
+++ b/tests/unit/src/ConfigCommonTests.cpp
@@ -23,7 +23,7 @@
 
 #include "TestHelper.hpp"
 
-#include "util/JsonParser.hpp"
+#include "awsiotsdk/util/JsonParser.hpp"
 #include "ConfigCommon.hpp"
 
 #define NUMBER_OF_CONFIGURATION_FIELDS 25
diff --git a/tests/unit/src/ResponseCodeTests.cpp b/tests/unit/src/ResponseCodeTests.cpp
index ada914e..b995e15 100644
--- a/tests/unit/src/ResponseCodeTests.cpp
+++ b/tests/unit/src/ResponseCodeTests.cpp
@@ -23,9 +23,9 @@
 
 #include "TestHelper.hpp"
 
-#include "ResponseCode.hpp"
+#include "awsiotsdk/ResponseCode.hpp"
 #include <iostream>
-#include "util/logging/LogSystemInterface.hpp"
+#include "awsiotsdk/util/logging/LogSystemInterface.hpp"
 
 namespace awsiotsdk {
     namespace tests {
diff --git a/tests/unit/src/discovery/DiscoveryTests.cpp b/tests/unit/src/discovery/DiscoveryTests.cpp
index f1fffda..c0ce3b8 100644
--- a/tests/unit/src/discovery/DiscoveryTests.cpp
+++ b/tests/unit/src/discovery/DiscoveryTests.cpp
@@ -23,13 +23,13 @@
 
 #include <gtest/gtest.h>
 
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
 #include "TestHelper.hpp"
 #include "MockNetworkConnection.hpp"
 
-#include "discovery/Discovery.hpp"
-#include "mqtt/ClientState.hpp"
+#include "awsiotsdk/discovery/Discovery.hpp"
+#include "awsiotsdk/mqtt/ClientState.hpp"
 
 #define DISCOVERY_TEST_LOG_TAG "[Discovery Unit Test]"
 
diff --git a/tests/unit/src/jobs/JobsTests.cpp b/tests/unit/src/jobs/JobsTests.cpp
index 56b5161..13c9bd1 100644
--- a/tests/unit/src/jobs/JobsTests.cpp
+++ b/tests/unit/src/jobs/JobsTests.cpp
@@ -23,13 +23,13 @@
 
 #include <gtest/gtest.h>
 
-#include "util/logging/LogMacros.hpp"
+#include "awsiotsdk/util/logging/LogMacros.hpp"
 
 #include "TestHelper.hpp"
 #include "MockNetworkConnection.hpp"
 
-#include "jobs/Jobs.hpp"
-#include "mqtt/ClientState.hpp"
+#include "awsiotsdk/jobs/Jobs.hpp"
+#include "awsiotsdk/mqtt/ClientState.hpp"
 
 #define JOBS_TEST_LOG_TAG "[Jobs Unit Test]"
 
diff --git a/tests/unit/src/mqtt/ConnectTests.cpp b/tests/unit/src/mqtt/ConnectTests.cpp
index 74dde91..a2dff5b 100644
--- a/tests/unit/src/mqtt/ConnectTests.cpp
+++ b/tests/unit/src/mqtt/ConnectTests.cpp
@@ -26,9 +26,9 @@
 #include "TestHelper.hpp"
 #include "MockNetworkConnection.hpp"
 
-#include "mqtt/Connect.hpp"
-#include "mqtt/ClientState.hpp"
-#include "mqtt/NetworkRead.hpp"
+#include "awsiotsdk/mqtt/Connect.hpp"
+#include "awsiotsdk/mqtt/ClientState.hpp"
+#include "awsiotsdk/mqtt/NetworkRead.hpp"
 
 #define CONNECT_FIXED_HEADER_VAL 0x10
 #define DISCONNECT_FIXED_HEADER_VAL 0xE0
diff --git a/tests/unit/src/mqtt/PublishTests.cpp b/tests/unit/src/mqtt/PublishTests.cpp
index 5ec802e..50f6a65 100644
--- a/tests/unit/src/mqtt/PublishTests.cpp
+++ b/tests/unit/src/mqtt/PublishTests.cpp
@@ -24,9 +24,9 @@
 #include "MockNetworkConnection.hpp"
 #include "TestHelper.hpp"
 
-#include "mqtt/Publish.hpp"
-#include "mqtt/ClientState.hpp"
-#include "mqtt/NetworkRead.hpp"
+#include "awsiotsdk/mqtt/Publish.hpp"
+#include "awsiotsdk/mqtt/ClientState.hpp"
+#include "awsiotsdk/mqtt/NetworkRead.hpp"
 
 #define PUBLISH_QOS0_FIXED_HEADER_RETAINED_FALSE_VAL 0x30
 #define PUBLISH_QOS0_FIXED_HEADER_RETAINED_TRUE_VAL 0x31
diff --git a/tests/unit/src/mqtt/SubscribeTests.cpp b/tests/unit/src/mqtt/SubscribeTests.cpp
index fd5d618..8211a12 100644
--- a/tests/unit/src/mqtt/SubscribeTests.cpp
+++ b/tests/unit/src/mqtt/SubscribeTests.cpp
@@ -25,8 +25,8 @@
 #include "MockNetworkConnection.hpp"
 #include "TestHelper.hpp"
 
-#include "mqtt/Subscribe.hpp"
-#include "mqtt/NetworkRead.hpp"
+#include "awsiotsdk/mqtt/Subscribe.hpp"
+#include "awsiotsdk/mqtt/NetworkRead.hpp"
 
 #define K 1024
 #define LARGE_PAYLOAD_SIZE 127 * K
diff --git a/tests/unit/src/util/JsonParserTests.cpp b/tests/unit/src/util/JsonParserTests.cpp
index c6a701d..5b2ce84 100644
--- a/tests/unit/src/util/JsonParserTests.cpp
+++ b/tests/unit/src/util/JsonParserTests.cpp
@@ -23,7 +23,7 @@
 
 #include "TestHelper.hpp"
 
-#include "util/JsonParser.hpp"
+#include "awsiotsdk/util/JsonParser.hpp"
 
 #define KEY_INVALID "test_invalid_key"