diff --git a/native/cpp/CommonCpp/Tools/CMakeLists.txt b/native/cpp/CommonCpp/Tools/CMakeLists.txt
--- a/native/cpp/CommonCpp/Tools/CMakeLists.txt
+++ b/native/cpp/CommonCpp/Tools/CMakeLists.txt
@@ -6,14 +6,14 @@
 find_package(Folly REQUIRED)
 
 set(TOOLS_HDRS
-  "include/comm/Tools/CommSecureStore.h"
-  "include/comm/Tools/Logger.h"
-  "include/comm/Tools/PlatformSpecificTools.h"
-  "include/comm/Tools/WorkerThread.h"
+  "CommSecureStore.h"
+  "Logger.h"
+  "PlatformSpecificTools.h"
+  "WorkerThread.h"
   )
 
 set(TOOLS_SRCS
-  "src/WorkerThread.cpp"
+  "WorkerThread.cpp"
   )
 
 add_library(comm-tools
@@ -28,7 +28,7 @@
 # reference local directory when building, use installation path when installing
 target_include_directories(comm-tools
   PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
@@ -38,7 +38,7 @@
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT comm-tools
 )
 
-install(FILES ${TOOLS_HDRS} DESTINATION include/comm/Tools)
+install(FILES ${TOOLS_HDRS} DESTINATION include/Tools)
 
 # For development purposes, can point cmake to this directory if doing development
 export(TARGETS comm-tools
diff --git a/native/cpp/CommonCpp/Tools/include/comm/Tools/CommSecureStore.h b/native/cpp/CommonCpp/Tools/CommSecureStore.h
rename from native/cpp/CommonCpp/Tools/include/comm/Tools/CommSecureStore.h
rename to native/cpp/CommonCpp/Tools/CommSecureStore.h
diff --git a/native/cpp/CommonCpp/Tools/include/comm/Tools/Logger.h b/native/cpp/CommonCpp/Tools/Logger.h
rename from native/cpp/CommonCpp/Tools/include/comm/Tools/Logger.h
rename to native/cpp/CommonCpp/Tools/Logger.h
diff --git a/native/cpp/CommonCpp/Tools/include/comm/Tools/PlatformSpecificTools.h b/native/cpp/CommonCpp/Tools/PlatformSpecificTools.h
rename from native/cpp/CommonCpp/Tools/include/comm/Tools/PlatformSpecificTools.h
rename to native/cpp/CommonCpp/Tools/PlatformSpecificTools.h
diff --git a/native/cpp/CommonCpp/Tools/include/comm/Tools/WorkerThread.h b/native/cpp/CommonCpp/Tools/WorkerThread.h
rename from native/cpp/CommonCpp/Tools/include/comm/Tools/WorkerThread.h
rename to native/cpp/CommonCpp/Tools/WorkerThread.h
diff --git a/native/cpp/CommonCpp/Tools/src/WorkerThread.cpp b/native/cpp/CommonCpp/Tools/WorkerThread.cpp
rename from native/cpp/CommonCpp/Tools/src/WorkerThread.cpp
rename to native/cpp/CommonCpp/Tools/WorkerThread.cpp
--- a/native/cpp/CommonCpp/Tools/src/WorkerThread.cpp
+++ b/native/cpp/CommonCpp/Tools/WorkerThread.cpp
@@ -1,5 +1,5 @@
-#include <comm/Tools/Logger.h>
-#include <comm/Tools/WorkerThread.h>
+#include <Tools/Logger.h>
+#include <Tools/WorkerThread.h>
 #include <sstream>
 
 namespace comm {