diff --git a/services/blob/Dockerfile b/services/blob/Dockerfile
index 02a3c97f8..710476e6d 100644
--- a/services/blob/Dockerfile
+++ b/services/blob/Dockerfile
@@ -1,25 +1,25 @@
 FROM commapp/services-base:1.3.2
 
 RUN apt-get update && \
   apt-get install -y uuid-dev && \
   rm -rf /var/lib/apt/lists/*
 
 ARG COMM_TEST_SERVICES
 ARG COMM_SERVICES_SANDBOX
 
 ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
 ENV COMM_SERVICES_SANDBOX=${COMM_SERVICES_SANDBOX}
 
 WORKDIR /transferred
 
 COPY services/lib/docker/ scripts/
-COPY services/blob/ blob
+COPY services/blob/old/ blob
 COPY services/lib/src lib/src/
 
 WORKDIR /transferred/blob
 
 ADD shared/protos grpc
 
 RUN ../scripts/build_service.sh
 
 CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then ../scripts/run_tests.sh; else ../scripts/run_service.sh; fi
diff --git a/services/blob/CMakeLists.txt b/services/blob/old/CMakeLists.txt
similarity index 93%
rename from services/blob/CMakeLists.txt
rename to services/blob/old/CMakeLists.txt
index c0abed7a3..6b53712a6 100644
--- a/services/blob/CMakeLists.txt
+++ b/services/blob/old/CMakeLists.txt
@@ -1,137 +1,139 @@
 PROJECT(blob C CXX)
 
 cmake_minimum_required(VERSION 3.16)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY bin)
 
 if(COMMAND cmake_policy)
   cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
 
 set(CMAKE_CXX_STANDARD 17)
 
 # FIND LIBS
 find_package(glog REQUIRED)
 find_package(Protobuf REQUIRED)
 find_package(gRPC REQUIRED)
 find_package(Folly REQUIRED)
 find_package(AWSSDK REQUIRED COMPONENTS s3 core dynamodb)
 find_package(Boost 1.40
   COMPONENTS program_options filesystem context regex system thread
   REQUIRED
 )
 find_package(OpenSSL REQUIRED)
 find_package(double-conversion REQUIRED)
 
 if(${CMAKE_CURRENT_SOURCE_DIR} MATCHES "^\/transferred.*")
   # Inside the docker build contex
   set(_proto_path "grpc")
+  set(_lib_path "../lib/src")
 else()
   # Inside repo
-  set(_proto_path "../../shared/protos")
+  set(_proto_path "../../../shared/protos")
+  set(_lib_path "../../lib/src")
 endif()
 
 # Shared Comm protos
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${_proto_path}
   ${CMAKE_CURRENT_BINARY_DIR}/protos
   EXCLUDE_FROM_ALL
 )
 
 # Reference native/cpp projects
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../lib/src
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${_lib_path}
   ${CMAKE_CURRENT_BINARY_DIR}/common # CMake's build directory
   EXCLUDE_FROM_ALL # Don't build everything, just what we need
 )
 
 file(GLOB_RECURSE SOURCE_CODE "./src/*.cpp")
 
 # SERVER
 add_executable(
   blob
 
   ${SOURCE_CODE}
 )
 
 set(
   INCLUDE_DIRS
   ${CMAKE_CURRENT_SOURCE_DIR}/src
   ${CMAKE_CURRENT_SOURCE_DIR}/src/server-base-reactors
   ${CMAKE_CURRENT_SOURCE_DIR}/src/DatabaseEntities
   ${CMAKE_CURRENT_SOURCE_DIR}/src/Reactors/
   ${CMAKE_CURRENT_SOURCE_DIR}/src/Reactors/server
   ${CMAKE_CURRENT_SOURCE_DIR}/src/Reactors/server/base-reactors
 
   ${Boost_INCLUDE_DIR}
 )
 
 target_include_directories(
   blob
   PUBLIC
   ${INCLUDE_DIRS}
 )
 
 set(
   LIBS
 
   ${GRPC_LIBS}
   ${AWSSDK_LINK_LIBRARIES}
   ${Boost_LIBRARIES}
   OpenSSL::SSL
   glog::glog
   gRPC::grpc++
   double-conversion::double-conversion
   Folly::folly
 
   comm-blob-grpc
   comm-server-base-reactors
   comm-services-common
 )
 
 target_link_libraries(
   blob
 
   ${LIBS}
 )
 
 install(
   TARGETS blob
   RUNTIME DESTINATION bin/
 )
 
 # TEST
 option(BUILD_TESTING "Turn on tests" ON)
 if (BUILD_TESTING)
   file(GLOB TEST_CODE "./test/*.cpp")
   list(FILTER SOURCE_CODE EXCLUDE REGEX "./src/server.cpp")
   enable_testing()
 
   find_package(GTest CONFIG REQUIRED)
   include_directories(
     ${GTEST_INCLUDE_DIR}
     ./test
   )
 
   add_executable(
     runTests
 
     ${SOURCE_CODE}
     ${TEST_CODE}
   )
 
   target_include_directories(
     runTests
     PUBLIC
     ${INCLUDE_DIRS}
   )
 
   target_link_libraries(
     runTests
 
     ${LIBS}
     GTest::gtest_main
   )
 
   include(GoogleTest)
   gtest_discover_tests(runTests)
 endif()
diff --git a/services/blob/src/AwsS3Bucket.cpp b/services/blob/old/src/AwsS3Bucket.cpp
similarity index 100%
rename from services/blob/src/AwsS3Bucket.cpp
rename to services/blob/old/src/AwsS3Bucket.cpp
diff --git a/services/blob/src/AwsS3Bucket.h b/services/blob/old/src/AwsS3Bucket.h
similarity index 100%
rename from services/blob/src/AwsS3Bucket.h
rename to services/blob/old/src/AwsS3Bucket.h
diff --git a/services/blob/src/BlobServiceImpl.cpp b/services/blob/old/src/BlobServiceImpl.cpp
similarity index 100%
rename from services/blob/src/BlobServiceImpl.cpp
rename to services/blob/old/src/BlobServiceImpl.cpp
diff --git a/services/blob/src/BlobServiceImpl.h b/services/blob/old/src/BlobServiceImpl.h
similarity index 100%
rename from services/blob/src/BlobServiceImpl.h
rename to services/blob/old/src/BlobServiceImpl.h
diff --git a/services/blob/src/Constants.h b/services/blob/old/src/Constants.h
similarity index 100%
rename from services/blob/src/Constants.h
rename to services/blob/old/src/Constants.h
diff --git a/services/blob/src/DatabaseEntities/BlobItem.cpp b/services/blob/old/src/DatabaseEntities/BlobItem.cpp
similarity index 100%
rename from services/blob/src/DatabaseEntities/BlobItem.cpp
rename to services/blob/old/src/DatabaseEntities/BlobItem.cpp
diff --git a/services/blob/src/DatabaseEntities/BlobItem.h b/services/blob/old/src/DatabaseEntities/BlobItem.h
similarity index 100%
rename from services/blob/src/DatabaseEntities/BlobItem.h
rename to services/blob/old/src/DatabaseEntities/BlobItem.h
diff --git a/services/blob/src/DatabaseEntities/ReverseIndexItem.cpp b/services/blob/old/src/DatabaseEntities/ReverseIndexItem.cpp
similarity index 100%
rename from services/blob/src/DatabaseEntities/ReverseIndexItem.cpp
rename to services/blob/old/src/DatabaseEntities/ReverseIndexItem.cpp
diff --git a/services/blob/src/DatabaseEntities/ReverseIndexItem.h b/services/blob/old/src/DatabaseEntities/ReverseIndexItem.h
similarity index 100%
rename from services/blob/src/DatabaseEntities/ReverseIndexItem.h
rename to services/blob/old/src/DatabaseEntities/ReverseIndexItem.h
diff --git a/services/blob/src/DatabaseManager.cpp b/services/blob/old/src/DatabaseManager.cpp
similarity index 100%
rename from services/blob/src/DatabaseManager.cpp
rename to services/blob/old/src/DatabaseManager.cpp
diff --git a/services/blob/src/DatabaseManager.h b/services/blob/old/src/DatabaseManager.h
similarity index 100%
rename from services/blob/src/DatabaseManager.h
rename to services/blob/old/src/DatabaseManager.h
diff --git a/services/blob/src/MultiPartUploader.cpp b/services/blob/old/src/MultiPartUploader.cpp
similarity index 100%
rename from services/blob/src/MultiPartUploader.cpp
rename to services/blob/old/src/MultiPartUploader.cpp
diff --git a/services/blob/src/MultiPartUploader.h b/services/blob/old/src/MultiPartUploader.h
similarity index 100%
rename from services/blob/src/MultiPartUploader.h
rename to services/blob/old/src/MultiPartUploader.h
diff --git a/services/blob/src/Reactors/server/GetReactor.h b/services/blob/old/src/Reactors/server/GetReactor.h
similarity index 100%
rename from services/blob/src/Reactors/server/GetReactor.h
rename to services/blob/old/src/Reactors/server/GetReactor.h
diff --git a/services/blob/src/Reactors/server/PutReactor.h b/services/blob/old/src/Reactors/server/PutReactor.h
similarity index 100%
rename from services/blob/src/Reactors/server/PutReactor.h
rename to services/blob/old/src/Reactors/server/PutReactor.h
diff --git a/services/blob/src/S3Path.cpp b/services/blob/old/src/S3Path.cpp
similarity index 100%
rename from services/blob/src/S3Path.cpp
rename to services/blob/old/src/S3Path.cpp
diff --git a/services/blob/src/S3Path.h b/services/blob/old/src/S3Path.h
similarity index 100%
rename from services/blob/src/S3Path.h
rename to services/blob/old/src/S3Path.h
diff --git a/services/blob/src/S3Tools.cpp b/services/blob/old/src/S3Tools.cpp
similarity index 100%
rename from services/blob/src/S3Tools.cpp
rename to services/blob/old/src/S3Tools.cpp
diff --git a/services/blob/src/S3Tools.h b/services/blob/old/src/S3Tools.h
similarity index 100%
rename from services/blob/src/S3Tools.h
rename to services/blob/old/src/S3Tools.h
diff --git a/services/blob/src/Tools.cpp b/services/blob/old/src/Tools.cpp
similarity index 100%
rename from services/blob/src/Tools.cpp
rename to services/blob/old/src/Tools.cpp
diff --git a/services/blob/src/Tools.h b/services/blob/old/src/Tools.h
similarity index 100%
rename from services/blob/src/Tools.h
rename to services/blob/old/src/Tools.h
diff --git a/services/blob/src/server.cpp b/services/blob/old/src/server.cpp
similarity index 100%
rename from services/blob/src/server.cpp
rename to services/blob/old/src/server.cpp
diff --git a/services/blob/test/DatabaseManagerTest.cpp b/services/blob/old/test/DatabaseManagerTest.cpp
similarity index 100%
rename from services/blob/test/DatabaseManagerTest.cpp
rename to services/blob/old/test/DatabaseManagerTest.cpp
diff --git a/services/blob/test/MultiPartUploadTest.cpp b/services/blob/old/test/MultiPartUploadTest.cpp
similarity index 100%
rename from services/blob/test/MultiPartUploadTest.cpp
rename to services/blob/old/test/MultiPartUploadTest.cpp
diff --git a/services/blob/test/StorageManagerTest.cpp b/services/blob/old/test/StorageManagerTest.cpp
similarity index 100%
rename from services/blob/test/StorageManagerTest.cpp
rename to services/blob/old/test/StorageManagerTest.cpp
diff --git a/services/blob/test/TestTools.cpp b/services/blob/old/test/TestTools.cpp
similarity index 100%
rename from services/blob/test/TestTools.cpp
rename to services/blob/old/test/TestTools.cpp
diff --git a/services/blob/test/TestTools.h b/services/blob/old/test/TestTools.h
similarity index 100%
rename from services/blob/test/TestTools.h
rename to services/blob/old/test/TestTools.h