diff --git a/native/cpp/CommonCpp/NativeModules/CMakeLists.txt b/native/cpp/CommonCpp/NativeModules/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/CMakeLists.txt
@@ -0,0 +1,84 @@
+project(comm-modules)
+cmake_minimum_required(VERSION 3.4)
+
+include(GNUInstallDirs)
+
+set(INTERNAL_HDRS
+  "include/comm/Internal/GlobalNetworkSingleton.h"
+  "include/comm/Internal/GlobalNetworkSingletonJNIHelper.h"
+  "include/comm/Internal/NetworkModule.h"
+  "include/comm/Internal/SocketStatus.h"
+  )
+
+set(INTERNAL_SRCS
+  "src/Internal/GlobalNetworkSingleton.cpp"
+  "src/Internal/NetworkModule.cpp"
+  )
+
+add_library(comm-modules-internal
+  ${INTERNAL_HDRS}
+  ${INTERNAL_SRCS}
+)
+
+set_target_properties(comm-modules-internal PROPERTIES LINKER_LANGUAGE CXX)
+
+target_link_libraries(comm-modules-internal
+  comm-tools
+  )
+
+set(NATIVE_HDRS
+  "include/comm/Native/CommCoreModule.h"
+  "include/comm/Native/MessageStoreOperations.h"
+  "include/comm/Native/ThreadStoreOperations.h"
+  )
+
+set(INTERNAL_SRCS
+  "src/Native/CommCoreModule.cpp"
+  )
+
+add_library(comm-modules-native
+  ${NATIVE_HDRS}
+  ${NATIVE_SRCS}
+)
+
+set_target_properties(comm-modules-native PROPERTIES LINKER_LANGUAGE CXX)
+
+# reference local directory when building, use installation path when installing
+target_include_directories(comm-modules-internal
+  PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+target_include_directories(comm-modules-native
+  PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+set(_components internal native)
+foreach(_component ${_components})
+
+  install(TARGETS comm-modules-${_component} EXPORT comm-modules-export
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT comm-tools
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT comm-tools
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT comm-tools
+  )
+
+endforeach()
+
+install(FILES ${INTERNAL_HDRS} DESTINATION include/comm/Internal)
+install(FILES ${NATIVE_HDRS} DESTINATION include/comm/Native)
+
+# For development purposes, can point cmake to this directory if doing development
+export(TARGETS comm-modules-internal comm-modules-native
+  NAMESPACE comm-tools::
+  FILE ${CMAKE_CURRENT_BINARY_DIR}/cmake/comm-modules/comm-modules-targets.cmake
+)
+
+# For installation
+install(EXPORT comm-modules-export
+  FILE comm-modules-targets.cmake
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/comm-modules
+  NAMESPACE comm-modules::
+)
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/CMakeDirectoryInformation.cmake b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/CMakeDirectoryInformation.cmake
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/CMakeDirectoryInformation.cmake
@@ -0,0 +1,16 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.22
+
+# Relative path conversion top directories.
+set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/jon/comm/comm/native/cpp/CommonCpp/Tools")
+set(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools")
+
+# Force unix paths in dependencies.
+set(CMAKE_FORCE_UNIX_PATHS 1)
+
+
+# The C and CXX include file regular expressions for this directory.
+set(CMAKE_C_INCLUDE_REGEX_SCAN "^.*$")
+set(CMAKE_C_INCLUDE_REGEX_COMPLAIN "^$")
+set(CMAKE_CXX_INCLUDE_REGEX_SCAN ${CMAKE_C_INCLUDE_REGEX_SCAN})
+set(CMAKE_CXX_INCLUDE_REGEX_COMPLAIN ${CMAKE_C_INCLUDE_REGEX_COMPLAIN})
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/Export/lib64/cmake/comm-tool/comm-tools-targets-noconfig.cmake b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/Export/lib64/cmake/comm-tool/comm-tools-targets-noconfig.cmake
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/Export/lib64/cmake/comm-tool/comm-tools-targets-noconfig.cmake
@@ -0,0 +1,19 @@
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "comm-tools::comm-tools" for configuration ""
+set_property(TARGET comm-tools::comm-tools APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
+set_target_properties(comm-tools::comm-tools PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "CXX"
+  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/lib64/libcomm-tools.a"
+  )
+
+list(APPEND _IMPORT_CHECK_TARGETS comm-tools::comm-tools )
+list(APPEND _IMPORT_CHECK_FILES_FOR_comm-tools::comm-tools "${_IMPORT_PREFIX}/lib64/libcomm-tools.a" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/Export/lib64/cmake/comm-tool/comm-tools-targets.cmake b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/Export/lib64/cmake/comm-tool/comm-tools-targets.cmake
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/Export/lib64/cmake/comm-tool/comm-tools-targets.cmake
@@ -0,0 +1,99 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.6)
+   message(FATAL_ERROR "CMake >= 2.6.0 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.6...3.20)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_targetsDefined)
+set(_targetsNotDefined)
+set(_expectedTargets)
+foreach(_expectedTarget comm-tools::comm-tools)
+  list(APPEND _expectedTargets ${_expectedTarget})
+  if(NOT TARGET ${_expectedTarget})
+    list(APPEND _targetsNotDefined ${_expectedTarget})
+  endif()
+  if(TARGET ${_expectedTarget})
+    list(APPEND _targetsDefined ${_expectedTarget})
+  endif()
+endforeach()
+if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
+  unset(_targetsDefined)
+  unset(_targetsNotDefined)
+  unset(_expectedTargets)
+  set(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT "${_targetsDefined}" STREQUAL "")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
+endif()
+unset(_targetsDefined)
+unset(_targetsNotDefined)
+unset(_expectedTargets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target comm-tools::comm-tools
+add_library(comm-tools::comm-tools STATIC IMPORTED)
+
+set_target_properties(comm-tools::comm-tools PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+  INTERFACE_LINK_LIBRARIES "Folly::folly"
+)
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+endif()
+
+# Load information for each installed configuration.
+get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+file(GLOB CONFIG_FILES "${_DIR}/comm-tools-targets-*.cmake")
+foreach(f ${CONFIG_FILES})
+  include(${f})
+endforeach()
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(target ${_IMPORT_CHECK_TARGETS} )
+  foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
+    if(NOT EXISTS "${file}" )
+      message(FATAL_ERROR "The imported target \"${target}\" references the file
+   \"${file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+  endforeach()
+  unset(_IMPORT_CHECK_FILES_FOR_${target})
+endforeach()
+unset(_IMPORT_CHECK_TARGETS)
+
+# This file does not depend on other imported targets which have
+# been exported from the same project but in a separate export set.
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/DependInfo.cmake b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/DependInfo.cmake
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/DependInfo.cmake
@@ -0,0 +1,19 @@
+
+# Consider dependencies only in project.
+set(CMAKE_DEPENDS_IN_PROJECT_ONLY OFF)
+
+# The set of languages for which implicit dependencies are needed:
+set(CMAKE_DEPENDS_LANGUAGES
+  )
+
+# The set of dependency files which are needed:
+set(CMAKE_DEPENDS_DEPENDENCY_FILES
+  "/home/jon/comm/comm/native/cpp/CommonCpp/Tools/src/WorkerThread.cpp" "/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.o" "gcc" "/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.o.d"
+  )
+
+# Targets to which this target links.
+set(CMAKE_TARGET_LINKED_INFO_FILES
+  )
+
+# Fortran module output directory.
+set(CMAKE_Fortran_TARGET_MODULE_DIR "")
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/build.make b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/build.make
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/build.make
@@ -0,0 +1,111 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.22
+
+# Delete rule output on recipe failure.
+.DELETE_ON_ERROR:
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+# Disable VCS-based implicit rules.
+% : %,v
+
+# Disable VCS-based implicit rules.
+% : RCS/%
+
+# Disable VCS-based implicit rules.
+% : RCS/%,v
+
+# Disable VCS-based implicit rules.
+% : SCCS/s.%
+
+# Disable VCS-based implicit rules.
+% : s.%
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+# Command-line flag to silence nested $(MAKE).
+$(VERBOSE)MAKESILENT = -s
+
+#Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+# A target that is always out of date.
+cmake_force:
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /nix/store/wavryx1qc6ym0vp897dqpx9sgzwr76wy-cmake-3.22.3/bin/cmake
+
+# The command to remove a file.
+RM = /nix/store/wavryx1qc6ym0vp897dqpx9sgzwr76wy-cmake-3.22.3/bin/cmake -E rm -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build
+
+# Include any dependencies generated for this target.
+include /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/depend.make
+# Include any dependencies generated by the compiler for this target.
+include /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/compiler_depend.make
+
+# Include the progress variables for this target.
+include /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/progress.make
+
+# Include the compile flags for this target's objects.
+include /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/flags.make
+
+/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.o: /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/flags.make
+/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.o: /home/jon/comm/comm/native/cpp/CommonCpp/Tools/src/WorkerThread.cpp
+/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.o: /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/compiler_depend.ts
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.o"
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools && /nix/store/61zfi5pmhb0d91422f186x26v7b52y5k-gcc-wrapper-11.3.0/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.o -MF CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.o.d -o CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.o -c /home/jon/comm/comm/native/cpp/CommonCpp/Tools/src/WorkerThread.cpp
+
+/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.i: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.i"
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools && /nix/store/61zfi5pmhb0d91422f186x26v7b52y5k-gcc-wrapper-11.3.0/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/jon/comm/comm/native/cpp/CommonCpp/Tools/src/WorkerThread.cpp > CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.i
+
+/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.s: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.s"
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools && /nix/store/61zfi5pmhb0d91422f186x26v7b52y5k-gcc-wrapper-11.3.0/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/jon/comm/comm/native/cpp/CommonCpp/Tools/src/WorkerThread.cpp -o CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.s
+
+# Object files for target comm-tools
+comm__tools_OBJECTS = \
+"CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.o"
+
+# External object files for target comm-tools
+comm__tools_EXTERNAL_OBJECTS =
+
+/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/libcomm-tools.a: /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.o
+/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/libcomm-tools.a: /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/build.make
+/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/libcomm-tools.a: /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/link.txt
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking CXX static library libcomm-tools.a"
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools && $(CMAKE_COMMAND) -P CMakeFiles/comm-tools.dir/cmake_clean_target.cmake
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/comm-tools.dir/link.txt --verbose=$(VERBOSE)
+
+# Rule to build all files generated by this target.
+/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/build: /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/libcomm-tools.a
+.PHONY : /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/build
+
+/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/clean:
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools && $(CMAKE_COMMAND) -P CMakeFiles/comm-tools.dir/cmake_clean.cmake
+.PHONY : /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/clean
+
+/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/depend:
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules /home/jon/comm/comm/native/cpp/CommonCpp/Tools /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/DependInfo.cmake --color=$(COLOR)
+.PHONY : /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/depend
+
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/cmake_clean.cmake b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/cmake_clean.cmake
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/cmake_clean.cmake
@@ -0,0 +1,11 @@
+file(REMOVE_RECURSE
+  "CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.o"
+  "CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.o.d"
+  "libcomm-tools.a"
+  "libcomm-tools.pdb"
+)
+
+# Per-language clean rules from dependency scanning.
+foreach(lang CXX)
+  include(CMakeFiles/comm-tools.dir/cmake_clean_${lang}.cmake OPTIONAL)
+endforeach()
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/cmake_clean_target.cmake b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/cmake_clean_target.cmake
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/cmake_clean_target.cmake
@@ -0,0 +1,3 @@
+file(REMOVE_RECURSE
+  "libcomm-tools.a"
+)
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/compiler_depend.make b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/compiler_depend.make
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/compiler_depend.make
@@ -0,0 +1,2 @@
+# Empty compiler generated dependencies file for comm-tools.
+# This may be replaced when dependencies are built.
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/compiler_depend.ts b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/compiler_depend.ts
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/compiler_depend.ts
@@ -0,0 +1,2 @@
+# CMAKE generated file: DO NOT EDIT!
+# Timestamp file for compiler generated dependencies management for comm-tools.
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/depend.make b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/depend.make
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/depend.make
@@ -0,0 +1,2 @@
+# Empty dependencies file for comm-tools.
+# This may be replaced when dependencies are built.
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/flags.make b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/flags.make
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/flags.make
@@ -0,0 +1,10 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.22
+
+# compile CXX with /nix/store/61zfi5pmhb0d91422f186x26v7b52y5k-gcc-wrapper-11.3.0/bin/g++
+CXX_DEFINES = -DBOOST_ALL_NO_LIB -DBOOST_ATOMIC_DYN_LINK -DBOOST_CONTEXT_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_REGEX_DYN_LINK -DBOOST_SYSTEM_DYN_LINK -DBOOST_THREAD_DYN_LINK -DFMT_LOCALE -DFMT_SHARED
+
+CXX_INCLUDES = -I/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/include -isystem /nix/store/6s09k8mzdayrpz8h9syi5g1274z0fw1v-double-conversion-3.2.0/include -isystem /nix/store/ik0y6zbr98f5hims75m350wfncj8fsha-gflags-2.2.2/include -isystem /nix/store/xqxqsf82xcxw9zkd7al26572wn14757g-glog-0.6.0/include -isystem /nix/store/9bmg6rvqnyxf8rsv1sv06m666jw015yc-libevent-2.1.12-dev/include -isystem /nix/store/cd2mc9gsf7va7ji8ncg50ccc78yp75di-xz-5.2.5-dev/include -isystem /nix/store/fbk3hi3z5fw9nhciyf5vqrbsq9abi43h-lz4-1.9.3-dev/include -isystem /nix/store/ani4w8kc4jqb3fgdq9lxhdxydmazih6s-zstd-1.5.2-dev/include -isystem /nix/store/g6xj44ny9v7r4swp8lz8fb5ymckg3bak-libiberty-11.3.0-dev/include/libiberty -isystem /nix/store/wv1n27jn5937dyjlbxff643m09rw85w5-libunwind-1.6.2-dev/include
+
+CXX_FLAGS = 
+
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/link.txt b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/link.txt
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/link.txt
@@ -0,0 +1,2 @@
+/nix/store/cz52w8xf3i1d3xvzpzd9abf7rvpl9017-binutils-2.38/bin/ar qc libcomm-tools.a CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.o
+/nix/store/cz52w8xf3i1d3xvzpzd9abf7rvpl9017-binutils-2.38/bin/ranlib libcomm-tools.a
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/progress.make b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/progress.make
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/progress.make
@@ -0,0 +1,3 @@
+CMAKE_PROGRESS_1 = 5
+CMAKE_PROGRESS_2 = 6
+
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/progress.marks b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/progress.marks
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/progress.marks
@@ -0,0 +1 @@
+2
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/Makefile b/native/cpp/CommonCpp/NativeModules/Tools/Makefile
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/Makefile
@@ -0,0 +1,231 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.22
+
+# Default target executed when no arguments are given to make.
+default_target: all
+.PHONY : default_target
+
+# Allow only one "make -f Makefile2" at a time, but pass parallelism.
+.NOTPARALLEL:
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+# Disable VCS-based implicit rules.
+% : %,v
+
+# Disable VCS-based implicit rules.
+% : RCS/%
+
+# Disable VCS-based implicit rules.
+% : RCS/%,v
+
+# Disable VCS-based implicit rules.
+% : SCCS/s.%
+
+# Disable VCS-based implicit rules.
+% : s.%
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+# Command-line flag to silence nested $(MAKE).
+$(VERBOSE)MAKESILENT = -s
+
+#Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+# A target that is always out of date.
+cmake_force:
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /nix/store/wavryx1qc6ym0vp897dqpx9sgzwr76wy-cmake-3.22.3/bin/cmake
+
+# The command to remove a file.
+RM = /nix/store/wavryx1qc6ym0vp897dqpx9sgzwr76wy-cmake-3.22.3/bin/cmake -E rm -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..."
+	/nix/store/wavryx1qc6ym0vp897dqpx9sgzwr76wy-cmake-3.22.3/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available.
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+.PHONY : edit_cache/fast
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/nix/store/wavryx1qc6ym0vp897dqpx9sgzwr76wy-cmake-3.22.3/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
+
+# Special rule for the target list_install_components
+list_install_components:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\" \"comm-tools\""
+.PHONY : list_install_components
+
+# Special rule for the target list_install_components
+list_install_components/fast: list_install_components
+.PHONY : list_install_components/fast
+
+# Special rule for the target install
+install: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+	/nix/store/wavryx1qc6ym0vp897dqpx9sgzwr76wy-cmake-3.22.3/bin/cmake -P cmake_install.cmake
+.PHONY : install
+
+# Special rule for the target install
+install/fast: preinstall/fast
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+	/nix/store/wavryx1qc6ym0vp897dqpx9sgzwr76wy-cmake-3.22.3/bin/cmake -P cmake_install.cmake
+.PHONY : install/fast
+
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/nix/store/wavryx1qc6ym0vp897dqpx9sgzwr76wy-cmake-3.22.3/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: preinstall/fast
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/nix/store/wavryx1qc6ym0vp897dqpx9sgzwr76wy-cmake-3.22.3/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/nix/store/wavryx1qc6ym0vp897dqpx9sgzwr76wy-cmake-3.22.3/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: preinstall/fast
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/nix/store/wavryx1qc6ym0vp897dqpx9sgzwr76wy-cmake-3.22.3/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip/fast
+
+# The main all target
+all: cmake_check_build_system
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build && $(CMAKE_COMMAND) -E cmake_progress_start /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build/CMakeFiles /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools//CMakeFiles/progress.marks
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
+clean:
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/clean
+.PHONY : clean
+
+# The main clean target
+clean/fast: clean
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+# Convenience name for target.
+/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/rule:
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/rule
+.PHONY : /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/rule
+
+# Convenience name for target.
+comm-tools: /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/rule
+.PHONY : comm-tools
+
+# fast build rule for target.
+comm-tools/fast:
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build && $(MAKE) $(MAKESILENT) -f /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/build.make /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/build
+.PHONY : comm-tools/fast
+
+src/WorkerThread.o: src/WorkerThread.cpp.o
+.PHONY : src/WorkerThread.o
+
+# target to build an object file
+src/WorkerThread.cpp.o:
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build && $(MAKE) $(MAKESILENT) -f /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/build.make /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.o
+.PHONY : src/WorkerThread.cpp.o
+
+src/WorkerThread.i: src/WorkerThread.cpp.i
+.PHONY : src/WorkerThread.i
+
+# target to preprocess a source file
+src/WorkerThread.cpp.i:
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build && $(MAKE) $(MAKESILENT) -f /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/build.make /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.i
+.PHONY : src/WorkerThread.cpp.i
+
+src/WorkerThread.s: src/WorkerThread.cpp.s
+.PHONY : src/WorkerThread.s
+
+# target to generate assembly for a file
+src/WorkerThread.cpp.s:
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build && $(MAKE) $(MAKESILENT) -f /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/build.make /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/comm-tools.dir/src/WorkerThread.cpp.s
+.PHONY : src/WorkerThread.cpp.s
+
+# Help Target
+help:
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... edit_cache"
+	@echo "... install"
+	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
+	@echo "... comm-tools"
+	@echo "... src/WorkerThread.o"
+	@echo "... src/WorkerThread.i"
+	@echo "... src/WorkerThread.s"
+.PHONY : help
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	cd /home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/build && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/cmake/comm-tools/comm-tools-targets.cmake b/native/cpp/CommonCpp/NativeModules/Tools/cmake/comm-tools/comm-tools-targets.cmake
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/cmake/comm-tools/comm-tools-targets.cmake
@@ -0,0 +1,64 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.6)
+   message(FATAL_ERROR "CMake >= 2.6.0 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.6...3.20)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_targetsDefined)
+set(_targetsNotDefined)
+set(_expectedTargets)
+foreach(_expectedTarget comm-tools::comm-tools)
+  list(APPEND _expectedTargets ${_expectedTarget})
+  if(NOT TARGET ${_expectedTarget})
+    list(APPEND _targetsNotDefined ${_expectedTarget})
+  endif()
+  if(TARGET ${_expectedTarget})
+    list(APPEND _targetsDefined ${_expectedTarget})
+  endif()
+endforeach()
+if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
+  unset(_targetsDefined)
+  unset(_targetsNotDefined)
+  unset(_expectedTargets)
+  set(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT "${_targetsDefined}" STREQUAL "")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
+endif()
+unset(_targetsDefined)
+unset(_targetsNotDefined)
+unset(_expectedTargets)
+
+
+# Create imported target comm-tools::comm-tools
+add_library(comm-tools::comm-tools STATIC IMPORTED)
+
+set_target_properties(comm-tools::comm-tools PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/include"
+  INTERFACE_LINK_LIBRARIES "Folly::folly"
+)
+
+# Import target "comm-tools::comm-tools" for configuration ""
+set_property(TARGET comm-tools::comm-tools APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
+set_target_properties(comm-tools::comm-tools PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "CXX"
+  IMPORTED_LOCATION_NOCONFIG "/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/libcomm-tools.a"
+  )
+
+# This file does not depend on other imported targets which have
+# been exported from the same project but in a separate export set.
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/native/cpp/CommonCpp/NativeModules/Tools/cmake_install.cmake b/native/cpp/CommonCpp/NativeModules/Tools/cmake_install.cmake
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/Tools/cmake_install.cmake
@@ -0,0 +1,76 @@
+# Install script for directory: /home/jon/comm/comm/native/cpp/CommonCpp/Tools
+
+# Set the install prefix
+if(NOT DEFINED CMAKE_INSTALL_PREFIX)
+  set(CMAKE_INSTALL_PREFIX "/var/empty/local")
+endif()
+string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+
+# Set the install configuration name.
+if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
+  if(BUILD_TYPE)
+    string(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
+           CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
+  else()
+    set(CMAKE_INSTALL_CONFIG_NAME "")
+  endif()
+  message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
+endif()
+
+# Set the component getting installed.
+if(NOT CMAKE_INSTALL_COMPONENT)
+  if(COMPONENT)
+    message(STATUS "Install component: \"${COMPONENT}\"")
+    set(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
+  else()
+    set(CMAKE_INSTALL_COMPONENT)
+  endif()
+endif()
+
+# Install shared libraries without execute permission?
+if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+  set(CMAKE_INSTALL_SO_NO_EXE "0")
+endif()
+
+# Is this installation the result of a crosscompile?
+if(NOT DEFINED CMAKE_CROSSCOMPILING)
+  set(CMAKE_CROSSCOMPILING "FALSE")
+endif()
+
+# Set default install directory permissions.
+if(NOT DEFINED CMAKE_OBJDUMP)
+  set(CMAKE_OBJDUMP "/nix/store/cz52w8xf3i1d3xvzpzd9abf7rvpl9017-binutils-2.38/bin/objdump")
+endif()
+
+if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xcomm-toolsx" OR NOT CMAKE_INSTALL_COMPONENT)
+  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib64" TYPE STATIC_LIBRARY FILES "/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/libcomm-tools.a")
+endif()
+
+if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_COMPONENT)
+  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include/comm/Tools" TYPE FILE FILES
+    "/home/jon/comm/comm/native/cpp/CommonCpp/Tools/include/comm/Tools/CommSecureStore.h"
+    "/home/jon/comm/comm/native/cpp/CommonCpp/Tools/include/comm/Tools/Logger.h"
+    "/home/jon/comm/comm/native/cpp/CommonCpp/Tools/include/comm/Tools/PlatformSpecificTools.h"
+    "/home/jon/comm/comm/native/cpp/CommonCpp/Tools/include/comm/Tools/WorkerThread.h"
+    )
+endif()
+
+if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_COMPONENT)
+  if(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib64/cmake/comm-tool/comm-tools-targets.cmake")
+    file(DIFFERENT EXPORT_FILE_CHANGED FILES
+         "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib64/cmake/comm-tool/comm-tools-targets.cmake"
+         "/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/Export/lib64/cmake/comm-tool/comm-tools-targets.cmake")
+    if(EXPORT_FILE_CHANGED)
+      file(GLOB OLD_CONFIG_FILES "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib64/cmake/comm-tool/comm-tools-targets-*.cmake")
+      if(OLD_CONFIG_FILES)
+        message(STATUS "Old export file \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib64/cmake/comm-tool/comm-tools-targets.cmake\" will be replaced.  Removing files [${OLD_CONFIG_FILES}].")
+        file(REMOVE ${OLD_CONFIG_FILES})
+      endif()
+    endif()
+  endif()
+  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib64/cmake/comm-tool" TYPE FILE FILES "/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/Export/lib64/cmake/comm-tool/comm-tools-targets.cmake")
+  if("${CMAKE_INSTALL_CONFIG_NAME}" MATCHES "^()$")
+    file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib64/cmake/comm-tool" TYPE FILE FILES "/home/jon/comm/comm/native/cpp/CommonCpp/NativeModules/Tools/CMakeFiles/Export/lib64/cmake/comm-tool/comm-tools-targets-noconfig.cmake")
+  endif()
+endif()
+
diff --git a/native/cpp/CommonCpp/NativeModules/InternalModules/GlobalNetworkSingleton.h b/native/cpp/CommonCpp/NativeModules/include/comm/Internal/GlobalNetworkSingleton.h
rename from native/cpp/CommonCpp/NativeModules/InternalModules/GlobalNetworkSingleton.h
rename to native/cpp/CommonCpp/NativeModules/include/comm/Internal/GlobalNetworkSingleton.h
--- a/native/cpp/CommonCpp/NativeModules/InternalModules/GlobalNetworkSingleton.h
+++ b/native/cpp/CommonCpp/NativeModules/include/comm/Internal/GlobalNetworkSingleton.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../Tools/WorkerThread.h"
-#include "NetworkModule.h"
+#include <comm/Internal/NetworkModule.h>
+#include <comm/Tools/WorkerThread.h>
 #include <functional>
 #include <memory>
 
diff --git a/native/cpp/CommonCpp/NativeModules/InternalModules/GlobalNetworkSingletonJNIHelper.h b/native/cpp/CommonCpp/NativeModules/include/comm/Internal/GlobalNetworkSingletonJNIHelper.h
rename from native/cpp/CommonCpp/NativeModules/InternalModules/GlobalNetworkSingletonJNIHelper.h
rename to native/cpp/CommonCpp/NativeModules/include/comm/Internal/GlobalNetworkSingletonJNIHelper.h
diff --git a/native/cpp/CommonCpp/NativeModules/InternalModules/NetworkModule.h b/native/cpp/CommonCpp/NativeModules/include/comm/Internal/NetworkModule.h
rename from native/cpp/CommonCpp/NativeModules/InternalModules/NetworkModule.h
rename to native/cpp/CommonCpp/NativeModules/include/comm/Internal/NetworkModule.h
--- a/native/cpp/CommonCpp/NativeModules/InternalModules/NetworkModule.h
+++ b/native/cpp/CommonCpp/NativeModules/include/comm/Internal/NetworkModule.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../grpc/Client.h"
 #include "SocketStatus.h"
+#include <comm/grpc/Client.h>
 #include <memory>
 #include <string>
 
diff --git a/native/cpp/CommonCpp/NativeModules/InternalModules/SocketStatus.h b/native/cpp/CommonCpp/NativeModules/include/comm/Internal/SocketStatus.h
rename from native/cpp/CommonCpp/NativeModules/InternalModules/SocketStatus.h
rename to native/cpp/CommonCpp/NativeModules/include/comm/Internal/SocketStatus.h
diff --git a/native/cpp/CommonCpp/NativeModules/CommCoreModule.h b/native/cpp/CommonCpp/NativeModules/include/comm/Native/CommCoreModule.h
rename from native/cpp/CommonCpp/NativeModules/CommCoreModule.h
rename to native/cpp/CommonCpp/NativeModules/include/comm/Native/CommCoreModule.h
diff --git a/native/cpp/CommonCpp/NativeModules/MessageStoreOperations.h b/native/cpp/CommonCpp/NativeModules/include/comm/Native/MessageStoreOperations.h
rename from native/cpp/CommonCpp/NativeModules/MessageStoreOperations.h
rename to native/cpp/CommonCpp/NativeModules/include/comm/Native/MessageStoreOperations.h
diff --git a/native/cpp/CommonCpp/NativeModules/ThreadStoreOperations.h b/native/cpp/CommonCpp/NativeModules/include/comm/Native/ThreadStoreOperations.h
rename from native/cpp/CommonCpp/NativeModules/ThreadStoreOperations.h
rename to native/cpp/CommonCpp/NativeModules/include/comm/Native/ThreadStoreOperations.h
diff --git a/native/cpp/CommonCpp/NativeModules/InternalModules/GlobalNetworkSingleton.cpp b/native/cpp/CommonCpp/NativeModules/src/Internal/GlobalNetworkSingleton.cpp
rename from native/cpp/CommonCpp/NativeModules/InternalModules/GlobalNetworkSingleton.cpp
rename to native/cpp/CommonCpp/NativeModules/src/Internal/GlobalNetworkSingleton.cpp
--- a/native/cpp/CommonCpp/NativeModules/InternalModules/GlobalNetworkSingleton.cpp
+++ b/native/cpp/CommonCpp/NativeModules/src/Internal/GlobalNetworkSingleton.cpp
@@ -1,4 +1,4 @@
-#include "GlobalNetworkSingleton.h"
+#include <comm/Internal/GlobalNetworkSingleton.h>
 
 namespace comm {
 GlobalNetworkSingleton GlobalNetworkSingleton::instance;
diff --git a/native/cpp/CommonCpp/NativeModules/InternalModules/NetworkModule.cpp b/native/cpp/CommonCpp/NativeModules/src/Internal/NetworkModule.cpp
rename from native/cpp/CommonCpp/NativeModules/InternalModules/NetworkModule.cpp
rename to native/cpp/CommonCpp/NativeModules/src/Internal/NetworkModule.cpp
--- a/native/cpp/CommonCpp/NativeModules/InternalModules/NetworkModule.cpp
+++ b/native/cpp/CommonCpp/NativeModules/src/Internal/NetworkModule.cpp
@@ -1,5 +1,5 @@
-#include "NetworkModule.h"
-#include "Logger.h"
+#include <comm/Internal/NetworkModule.h>
+#include <comm/Tools/Logger.h>
 
 namespace comm {
 void NetworkModule::initializeNetworkModule(
diff --git a/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp b/native/cpp/CommonCpp/NativeModules/src/Native/CommCoreModule.cpp
rename from native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp
rename to native/cpp/CommonCpp/NativeModules/src/Native/CommCoreModule.cpp