diff --git a/services/blob/Dockerfile b/services/blob/Dockerfile
--- a/services/blob/Dockerfile
+++ b/services/blob/Dockerfile
@@ -13,7 +13,7 @@
 WORKDIR /transferred
 
 COPY services/lib/docker/ scripts/
-COPY services/blob/ blob
+COPY services/blob/cpp/ blob
 COPY services/lib/src lib/src/
 
 WORKDIR /transferred/blob
diff --git a/services/blob/CMakeLists.txt b/services/blob/cpp/CMakeLists.txt
rename from services/blob/CMakeLists.txt
rename to services/blob/cpp/CMakeLists.txt
--- a/services/blob/CMakeLists.txt
+++ b/services/blob/cpp/CMakeLists.txt
@@ -27,9 +27,11 @@
 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
@@ -39,7 +41,7 @@
 )
 
 # 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
 )
diff --git a/services/blob/src/AwsS3Bucket.h b/services/blob/cpp/src/AwsS3Bucket.h
rename from services/blob/src/AwsS3Bucket.h
rename to services/blob/cpp/src/AwsS3Bucket.h
diff --git a/services/blob/src/AwsS3Bucket.cpp b/services/blob/cpp/src/AwsS3Bucket.cpp
rename from services/blob/src/AwsS3Bucket.cpp
rename to services/blob/cpp/src/AwsS3Bucket.cpp
diff --git a/services/blob/src/BlobServiceImpl.h b/services/blob/cpp/src/BlobServiceImpl.h
rename from services/blob/src/BlobServiceImpl.h
rename to services/blob/cpp/src/BlobServiceImpl.h
diff --git a/services/blob/src/BlobServiceImpl.cpp b/services/blob/cpp/src/BlobServiceImpl.cpp
rename from services/blob/src/BlobServiceImpl.cpp
rename to services/blob/cpp/src/BlobServiceImpl.cpp
diff --git a/services/blob/src/Constants.h b/services/blob/cpp/src/Constants.h
rename from services/blob/src/Constants.h
rename to services/blob/cpp/src/Constants.h
diff --git a/services/blob/src/DatabaseEntities/BlobItem.h b/services/blob/cpp/src/DatabaseEntities/BlobItem.h
rename from services/blob/src/DatabaseEntities/BlobItem.h
rename to services/blob/cpp/src/DatabaseEntities/BlobItem.h
diff --git a/services/blob/src/DatabaseEntities/BlobItem.cpp b/services/blob/cpp/src/DatabaseEntities/BlobItem.cpp
rename from services/blob/src/DatabaseEntities/BlobItem.cpp
rename to services/blob/cpp/src/DatabaseEntities/BlobItem.cpp
diff --git a/services/blob/src/DatabaseEntities/ReverseIndexItem.h b/services/blob/cpp/src/DatabaseEntities/ReverseIndexItem.h
rename from services/blob/src/DatabaseEntities/ReverseIndexItem.h
rename to services/blob/cpp/src/DatabaseEntities/ReverseIndexItem.h
diff --git a/services/blob/src/DatabaseEntities/ReverseIndexItem.cpp b/services/blob/cpp/src/DatabaseEntities/ReverseIndexItem.cpp
rename from services/blob/src/DatabaseEntities/ReverseIndexItem.cpp
rename to services/blob/cpp/src/DatabaseEntities/ReverseIndexItem.cpp
diff --git a/services/blob/src/DatabaseManager.h b/services/blob/cpp/src/DatabaseManager.h
rename from services/blob/src/DatabaseManager.h
rename to services/blob/cpp/src/DatabaseManager.h
diff --git a/services/blob/src/DatabaseManager.cpp b/services/blob/cpp/src/DatabaseManager.cpp
rename from services/blob/src/DatabaseManager.cpp
rename to services/blob/cpp/src/DatabaseManager.cpp
diff --git a/services/blob/src/MultiPartUploader.h b/services/blob/cpp/src/MultiPartUploader.h
rename from services/blob/src/MultiPartUploader.h
rename to services/blob/cpp/src/MultiPartUploader.h
diff --git a/services/blob/src/MultiPartUploader.cpp b/services/blob/cpp/src/MultiPartUploader.cpp
rename from services/blob/src/MultiPartUploader.cpp
rename to services/blob/cpp/src/MultiPartUploader.cpp
diff --git a/services/blob/src/Reactors/server/GetReactor.h b/services/blob/cpp/src/Reactors/server/GetReactor.h
rename from services/blob/src/Reactors/server/GetReactor.h
rename to services/blob/cpp/src/Reactors/server/GetReactor.h
diff --git a/services/blob/src/Reactors/server/PutReactor.h b/services/blob/cpp/src/Reactors/server/PutReactor.h
rename from services/blob/src/Reactors/server/PutReactor.h
rename to services/blob/cpp/src/Reactors/server/PutReactor.h
diff --git a/services/blob/src/S3Path.h b/services/blob/cpp/src/S3Path.h
rename from services/blob/src/S3Path.h
rename to services/blob/cpp/src/S3Path.h
diff --git a/services/blob/src/S3Path.cpp b/services/blob/cpp/src/S3Path.cpp
rename from services/blob/src/S3Path.cpp
rename to services/blob/cpp/src/S3Path.cpp
diff --git a/services/blob/src/S3Tools.h b/services/blob/cpp/src/S3Tools.h
rename from services/blob/src/S3Tools.h
rename to services/blob/cpp/src/S3Tools.h
diff --git a/services/blob/src/S3Tools.cpp b/services/blob/cpp/src/S3Tools.cpp
rename from services/blob/src/S3Tools.cpp
rename to services/blob/cpp/src/S3Tools.cpp
diff --git a/services/blob/src/Tools.h b/services/blob/cpp/src/Tools.h
rename from services/blob/src/Tools.h
rename to services/blob/cpp/src/Tools.h
diff --git a/services/blob/src/Tools.cpp b/services/blob/cpp/src/Tools.cpp
rename from services/blob/src/Tools.cpp
rename to services/blob/cpp/src/Tools.cpp
diff --git a/services/blob/src/server.cpp b/services/blob/cpp/src/server.cpp
rename from services/blob/src/server.cpp
rename to services/blob/cpp/src/server.cpp
diff --git a/services/blob/test/DatabaseManagerTest.cpp b/services/blob/cpp/test/DatabaseManagerTest.cpp
rename from services/blob/test/DatabaseManagerTest.cpp
rename to services/blob/cpp/test/DatabaseManagerTest.cpp
diff --git a/services/blob/test/MultiPartUploadTest.cpp b/services/blob/cpp/test/MultiPartUploadTest.cpp
rename from services/blob/test/MultiPartUploadTest.cpp
rename to services/blob/cpp/test/MultiPartUploadTest.cpp
diff --git a/services/blob/test/StorageManagerTest.cpp b/services/blob/cpp/test/StorageManagerTest.cpp
rename from services/blob/test/StorageManagerTest.cpp
rename to services/blob/cpp/test/StorageManagerTest.cpp
diff --git a/services/blob/test/TestTools.h b/services/blob/cpp/test/TestTools.h
rename from services/blob/test/TestTools.h
rename to services/blob/cpp/test/TestTools.h
diff --git a/services/blob/test/TestTools.cpp b/services/blob/cpp/test/TestTools.cpp
rename from services/blob/test/TestTools.cpp
rename to services/blob/cpp/test/TestTools.cpp