diff --git a/services/blob/CMakeLists.txt b/services/blob/CMakeLists.txt
--- a/services/blob/CMakeLists.txt
+++ b/services/blob/CMakeLists.txt
@@ -26,7 +26,7 @@
 
 file(GLOB GENERATED_CODE "./_generated/*.cc")
 
-file(GLOB SOURCE_CODE "./src/*.cpp" "./src/**/*.cpp")
+file(GLOB_RECURSE SOURCE_CODE "./src/*.cpp")
 
 include_directories(
   ./src
diff --git a/services/blob/src/DynamoDBTools.h b/services/blob/src/DynamoDBTools.h
deleted file mode 100644
--- a/services/blob/src/DynamoDBTools.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "Constants.h"
-
-#include <aws/core/Aws.h>
-#include <aws/dynamodb/DynamoDBClient.h>
-
-#include <memory>
-
-namespace comm {
-namespace network {
-
-std::unique_ptr<Aws::DynamoDB::DynamoDBClient> getDynamoDBClient();
-
-} // namespace network
-} // namespace comm
diff --git a/services/blob/src/DynamoDBTools.cpp b/services/blob/src/DynamoDBTools.cpp
deleted file mode 100644
--- a/services/blob/src/DynamoDBTools.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "DynamoDBTools.h"
-#include "Constants.h"
-
-namespace comm {
-namespace network {
-
-std::unique_ptr<Aws::DynamoDB::DynamoDBClient> getDynamoDBClient() {
-  Aws::Client::ClientConfiguration config;
-  config.region = AWS_REGION;
-  if (isDevMode()) {
-    config.endpointOverride = Aws::String("localstack:4566");
-    config.scheme = Aws::Http::Scheme::HTTP;
-  }
-  return std::make_unique<Aws::DynamoDB::DynamoDBClient>(config);
-}
-
-} // namespace network
-} // namespace comm
diff --git a/services/backup/src/DynamoDBTools.h b/services/lib/src/DynamoDBTools.h
rename from services/backup/src/DynamoDBTools.h
rename to services/lib/src/DynamoDBTools.h
diff --git a/services/backup/src/DynamoDBTools.cpp b/services/lib/src/DynamoDBTools.cpp
rename from services/backup/src/DynamoDBTools.cpp
rename to services/lib/src/DynamoDBTools.cpp