diff --git a/native/cpp/CommonCpp/CMakeLists.txt b/native/cpp/CommonCpp/CMakeLists.txt
index 67d0032e4..e8ff03213 100644
--- a/native/cpp/CommonCpp/CMakeLists.txt
+++ b/native/cpp/CommonCpp/CMakeLists.txt
@@ -1,17 +1,21 @@
 project(comm-common-cpp)
 
 # 3.13+ required for CMP0079 to be set
 cmake_minimum_required(VERSION 3.13)
 
 include(GNUInstallDirs)
 
 add_subdirectory(grpc)
 add_subdirectory(CryptoTools)
 add_subdirectory(DatabaseManagers)
 add_subdirectory(NativeModules)
 add_subdirectory(Tools)
 
+target_link_libraries(comm-client
+  comm-modules-native
+)
+
 target_link_libraries(comm-cryptotools
   comm-tools
   comm-databasemanagers
 )
diff --git a/native/cpp/CommonCpp/grpc/CMakeLists.txt b/native/cpp/CommonCpp/grpc/CMakeLists.txt
index 295ded20c..2deb2a28b 100644
--- a/native/cpp/CommonCpp/grpc/CMakeLists.txt
+++ b/native/cpp/CommonCpp/grpc/CMakeLists.txt
@@ -1,144 +1,138 @@
 project(grpc-comm)
 cmake_minimum_required(VERSION 3.4)
 
 include(GNUInstallDirs)
 find_package(protobuf REQUIRED)
 find_package(gRPC REQUIRED)
-# TODO: remove once native modules can be
-# imported in CommonCpp/CMakeLists.txt
-find_package(Folly REQUIRED)
 
 set(CMAKE_CXX_STANDARD 14)
 # Allow for tools on PATH to be found
 find_program(_PROTOBUF_PROTOC protoc
   HINTS "${_PROTOBUF_PROTOC}")
 find_program(_GRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin
   HINTS "${_GRPC_CPP_PLUGIN_EXECUTABLE}")
 
 set(_proto_dir "${CMAKE_CURRENT_SOURCE_DIR}/protos")
 set(_components backup blob tunnelbroker)
 set(TARGETS)
 
 # Iterate through each protobuf file
 # and create headers, sources, and export as component library
 foreach(component ${_components})
   set(LIB_NAME comm-${component}-grpc)
   set(TARGETS ${TARGETS} ${LIB_NAME})
 
   set(BIN_PROTO_HDRS
     ${component}.pb.h
     ${component}.grpc.pb.h
   )
 
   set(BIN_PROTO_SRCS
     ${component}.pb.cc
     ${component}.grpc.pb.cc
   )
 
   set(_proto_file "${_proto_dir}/${component}.proto")
   # Generate headers from protobuf files, and copy them to _generated dir
   add_custom_command(
     OUTPUT ${BIN_PROTO_HDRS} ${BIN_PROTO_SRCS}
     COMMAND ${_PROTOBUF_PROTOC} --grpc_out "${CMAKE_CURRENT_BINARY_DIR}"
     --cpp_out "${CMAKE_CURRENT_BINARY_DIR}"
     -I "${_proto_dir}"
     --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
     "${_proto_file}"
     COMMAND sed 's|^// Genera|// @genera|g' ${component}.grpc.pb.h
       > ${CMAKE_CURRENT_SOURCE_DIR}/_generated/${component}.grpc.pb.h
     COMMAND sed 's|^// Genera|// @genera|g' ${component}.grpc.pb.cc
       > ${CMAKE_CURRENT_SOURCE_DIR}/_generated/${component}.grpc.pb.cc
     COMMAND sed 's|^// Genera|// @genera|g' ${component}.pb.h
       > ${CMAKE_CURRENT_SOURCE_DIR}/_generated/${component}.pb.h
     COMMAND sed 's|^// Genera|// @genera|g' ${component}.pb.cc
       > ${CMAKE_CURRENT_SOURCE_DIR}/_generated/${component}.pb.cc
     DEPENDS "${_proto_file}"
     MAIN_DEPENDENCY "${_proto_file}"
     COMMENT "Generate protobuf files for ${component}"
   )
 
   add_library(${LIB_NAME}
     ${BIN_PROTO_HDRS} ${BIN_PROTO_SRCS}
   )
 
   target_link_libraries(${LIB_NAME}
     gRPC::grpc++
     protobuf::libprotobuf
   )
 
   # reference local directory when building
   # use installation path when installing
   target_include_directories(${LIB_NAME}
     PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../Tools>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
   )
 
   install(TARGETS ${LIB_NAME} EXPORT comm-export
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${LIB_NAME}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${LIB_NAME}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${LIB_NAME}
   )
 
   # ensure headers are also installed
   install(FILES ${PROTO_HDRS} DESTINATION include/comm/grpc)
 endforeach()
 
 set(CLIENT_HDRS
   "Client.h"
   "ClientGetReadReactor.h"
   "GRPCStreamHostObject.h"
 )
 
 set(CLIENT_SRCS
   "Client.cpp"
   "ClientGetReadReactor.cpp"
   "GRPCStreamHostObject.cpp"
 )
 
 add_library(comm-client
   ${CLIENT_HDRS}
   ${CLIENT_SRCS}
 )
 
 target_link_libraries(comm-client
   gRPC::grpc++
   protobuf::libprotobuf
   comm-tunnelbroker-grpc
-  # TODO: remove once native modules can be
-  # imported in CommonCpp/CMakeLists.txt
-  Folly::folly
 )
 
 target_include_directories(comm-client
   PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
   # HACK: add complete cmake support to react-native?
   PRIVATE
   "../../../node_modules/react-native/ReactCommon/callinvoker"
   "../../../node_modules/react-native/ReactCommon/jsi"
 )
 
 install(TARGETS comm-client EXPORT comm-export
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT comm-client
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT comm-client
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT comm-client
 )
 
 install(FILES ${CLIENT_HDRS} DESTINATION include/grpc)
 
 # For development purposes, able to reference build directory
 export(TARGETS ${TARGETS} comm-client
   NAMESPACE comm-grpc::
   FILE ${CMAKE_CURRENT_BINARY_DIR}/cmake/comm-grpc/comm-grpc-targets.cmake
 )
 
 # For installation
 install(EXPORT comm-export
   FILE comm-grpc-targets.cmake
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/comm-grpc
   NAMESPACE comm-grpc::
 )