diff --git a/services/backup/Dockerfile b/services/backup/Dockerfile
--- a/services/backup/Dockerfile
+++ b/services/backup/Dockerfile
@@ -13,9 +13,10 @@
 WORKDIR /transferred
 
 COPY native/cpp/CommonCpp/grpc/protos/backup.proto native/cpp/CommonCpp/grpc/protos/blob.proto protos/
-COPY services/lib/ .
+COPY services/lib/cmake-components cmake-components
 COPY services/lib/docker/ scripts/
 COPY services/backup/ .
+COPY services/lib/src/* src/
 
 RUN scripts/build_service.sh
 
diff --git a/services/blob/Dockerfile b/services/blob/Dockerfile
--- a/services/blob/Dockerfile
+++ b/services/blob/Dockerfile
@@ -4,18 +4,19 @@
   apt-get install -y uuid-dev && \
   rm -rf /var/lib/apt/lists/*
 
+ARG COMM_TEST_SERVICES
+ARG COMM_SERVICES_DEV_MODE
+
+ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
+ENV COMM_SERVICES_DEV_MODE=${COMM_SERVICES_DEV_MODE}
+
 WORKDIR /transferred
 
 COPY native/cpp/CommonCpp/grpc/protos/blob.proto protos/blob.proto
-COPY services/lib/ .
+COPY services/lib/cmake-components cmake-components
 COPY services/lib/docker/ scripts/
 COPY services/blob/ .
-
-ARG COMM_SERVICES_DEV_MODE
-ENV COMM_SERVICES_DEV_MODE=${COMM_SERVICES_DEV_MODE}
-
-ARG COMM_TEST_SERVICES
-ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
+COPY services/lib/src/* src/
 
 RUN scripts/build_service.sh
 
diff --git a/services/blob/src/DatabaseEntities/Item.h b/services/blob/src/DatabaseEntities/Item.h
deleted file mode 100644
--- a/services/blob/src/DatabaseEntities/Item.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once
-
-#include <aws/core/Aws.h>
-#include <aws/dynamodb/DynamoDBClient.h>
-
-#include <memory>
-#include <string>
-
-namespace comm {
-namespace network {
-namespace database {
-
-typedef Aws::Map<Aws::String, Aws::DynamoDB::Model::AttributeValue>
-    AttributeValues;
-
-struct PrimaryKeyBase {
-  PrimaryKeyBase(const std::string partitionKey)
-      : partitionKey(partitionKey), sortKey(nullptr) {
-  }
-  PrimaryKeyBase(const std::string partitionKey, const std::string sortKey)
-      : partitionKey(partitionKey),
-        sortKey(std::make_unique<std::string>(sortKey)) {
-  }
-
-  const std::string partitionKey;
-  std::unique_ptr<std::string> sortKey;
-};
-
-struct PrimaryKey : PrimaryKeyBase {
-  using PrimaryKeyBase::PrimaryKeyBase;
-};
-
-struct PrimaryKeyValue : PrimaryKeyBase {
-  using PrimaryKeyBase::PrimaryKeyBase;
-};
-
-class Item {
-  virtual void validate() const = 0;
-
-public:
-  virtual std::string getTableName() const = 0;
-  virtual PrimaryKey getPrimaryKey() const = 0;
-  virtual PrimaryKeyValue getPrimaryKeyValue() const = 0;
-  virtual void assignItemFromDatabase(const AttributeValues &itemFromDB) = 0;
-};
-
-} // namespace database
-} // namespace network
-} // namespace comm
diff --git a/services/lib/lib_src/BaseReactor.h b/services/lib/lib_src/BaseReactor.h
deleted file mode 100644
--- a/services/lib/lib_src/BaseReactor.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "ReactorStatusHolder.h"
-
-#include <grpcpp/grpcpp.h>
-
-#include <memory>
-
-namespace comm {
-namespace network {
-namespace reactor {
-
-class BaseReactor {
-public:
-  virtual std::shared_ptr<ReactorStatusHolder> getUtility() = 0;
-  virtual void terminate(const grpc::Status &status) = 0;
-  virtual void validate() = 0;
-  virtual void doneCallback() = 0;
-  virtual void terminateCallback() = 0;
-};
-
-} // namespace reactor
-} // namespace network
-} // namespace comm
diff --git a/services/backup/src/DatabaseEntities/Item.h b/services/lib/src/Item.h
rename from services/backup/src/DatabaseEntities/Item.h
rename to services/lib/src/Item.h