diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
index a56445b..e209d27 100644
--- a/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@ -112,15 +112,14 @@ message(STATUS "Using logos-storage-module at: ${LOGOS_STORAGE_ROOT}")
 
 ########### SOURCES ###########
 
-set(SOURCES
-    main.cpp
+set(COMMON_SOURCES
     logos_manager.cpp
     logos_manager.h
 )
 
 # Add SDK sources (only if source layout, installed layout uses the library)
 if(_cpp_sdk_is_source)
-    list(APPEND SOURCES
+    list(APPEND COMMON_SOURCES
         ${LOGOS_CPP_SDK_ROOT}/cpp/logos_api.cpp
         ${LOGOS_CPP_SDK_ROOT}/cpp/logos_api.h
         ${LOGOS_CPP_SDK_ROOT}/cpp/logos_api_client.cpp
@@ -232,7 +231,7 @@ if(_cpp_sdk_is_source)
         add_dependencies(run_cpp_generator_logos_cli run_cpp_generator_storage_module)
     endif()
 
-    list(APPEND SOURCES ${PLUGINS_OUTPUT_DIR}/logos_sdk.cpp)
+    list(APPEND COMMON_SOURCES ${PLUGINS_OUTPUT_DIR}/logos_sdk.cpp)
 
     # Mark as generated so CMake knows to wait for it
     set_source_files_properties(
@@ -242,7 +241,7 @@ if(_cpp_sdk_is_source)
 else()
     # For installed/nix layout, logos_sdk.cpp is already pre-generated
     set(PLUGINS_OUTPUT_DIR "${CMAKE_SOURCE_DIR}/generated_code")
-    list(APPEND SOURCES ${PLUGINS_OUTPUT_DIR}/logos_sdk.cpp)
+    list(APPEND COMMON_SOURCES ${PLUGINS_OUTPUT_DIR}/logos_sdk.cpp)
 endif()
 
 ########### CPP GENERATOR END ###########
@@ -262,11 +261,10 @@ link_directories(
 # Set output directories
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-# Create the executable
-add_executable(logos-storage-cli ${SOURCES})
+# Shared library target holding common sources, includes, and link libraries
+add_library(logos-common STATIC ${COMMON_SOURCES})
 
-# Link libraries
-target_link_libraries(logos-storage-cli PRIVATE
+target_link_libraries(logos-common PUBLIC
     Qt${QT_VERSION_MAJOR}::Core
     Qt${QT_VERSION_MAJOR}::RemoteObjects
     logos_core
@@ -275,33 +273,40 @@ target_link_libraries(logos-storage-cli PRIVATE
 # Link SDK library if using installed layout (source layout compiles the SDK directly)
 if(NOT _cpp_sdk_is_source)
     find_library(LOGOS_SDK_LIB logos_sdk PATHS ${LOGOS_CPP_SDK_ROOT}/lib NO_DEFAULT_PATH REQUIRED)
-    target_link_libraries(logos-storage-cli PRIVATE ${LOGOS_SDK_LIB})
+    target_link_libraries(logos-common PUBLIC ${LOGOS_SDK_LIB})
 endif()
 
+# Create executables
+add_executable(logos-uploader uploader.cpp)
+target_link_libraries(logos-uploader PRIVATE logos-common)
+
+add_executable(logos-downloader downloader.cpp)
+target_link_libraries(logos-downloader PRIVATE logos-common)
+
 ########### APP DEFINITION END ###########
 
 ########### HEADERS ###########
 
-# Include directories
-target_include_directories(logos-storage-cli PRIVATE
+# Include directories on the common target so all executables inherit them
+target_include_directories(logos-common PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${PLUGINS_OUTPUT_DIR}
 )
 
 if(_liblogos_is_source)
-    target_include_directories(logos-storage-cli PRIVATE ${LOGOS_LIBLOGOS_ROOT})
+    target_include_directories(logos-common PUBLIC ${LOGOS_LIBLOGOS_ROOT})
 else()
-    target_include_directories(logos-storage-cli PRIVATE ${LOGOS_LIBLOGOS_ROOT}/include)
+    target_include_directories(logos-common PUBLIC ${LOGOS_LIBLOGOS_ROOT}/include)
 endif()
 
 if(_cpp_sdk_is_source)
-    target_include_directories(logos-storage-cli PRIVATE
+    target_include_directories(logos-common PUBLIC
         ${LOGOS_CPP_SDK_ROOT}/cpp
         ${LOGOS_CPP_SDK_ROOT}/cpp/generated
     )
 else()
-    target_include_directories(logos-storage-cli PRIVATE
+    target_include_directories(logos-common PUBLIC
         ${LOGOS_CPP_SDK_ROOT}/include
         ${LOGOS_CPP_SDK_ROOT}/include/cpp
         ${LOGOS_CPP_SDK_ROOT}/include/core
@@ -314,11 +319,11 @@ endif()
 ########### GENERATOR DEPENDENCY ###########
 
 if(_cpp_sdk_is_source)
-    add_dependencies(logos-storage-cli run_cpp_generator_logos_cli)
+    add_dependencies(logos-common run_cpp_generator_logos_cli)
 endif()
 
 if(_storage_module_is_source)
-    add_dependencies(logos-storage-cli run_cpp_generator_storage_module)
+    add_dependencies(logos-common run_cpp_generator_storage_module)
 endif()
 
 ########### GENERATOR DEPENDENCY END ###########
@@ -342,7 +347,7 @@ if(NOT EXISTS "${LOGOS_CPP_SDK_ROOT}/lib/liblogos_sdk.a" AND NOT EXISTS "${LOGOS
         VERBATIM
     )
 
-    add_dependencies(logos-storage-cli run_build_cpp_sdk)
+    add_dependencies(logos-common run_build_cpp_sdk)
 endif()
 
 if(NOT EXISTS "${LOGOS_LIBLOGOS_ROOT}/lib/liblogos_core.a" AND NOT EXISTS "${LOGOS_LIBLOGOS_ROOT}/lib/liblogos_core.dylib" AND NOT EXISTS "${LOGOS_LIBLOGOS_ROOT}/lib/liblogos_core.so")
@@ -361,32 +366,34 @@ if(NOT EXISTS "${LOGOS_LIBLOGOS_ROOT}/lib/liblogos_core.a" AND NOT EXISTS "${LOG
       VERBATIM
     )
 
-    add_dependencies(logos-storage-cli run_build_liblogos)
+    add_dependencies(logos-common run_build_liblogos)
 endif()
 
 ########### LOGOS DEPENDENCIES END ###########
 
 ########### RUNTIME LINKS ###########
 
-# Set RPATH settings for the executable
-if(APPLE)
-    set_target_properties(logos-storage-cli PROPERTIES
-        INSTALL_RPATH "@executable_path/../lib"
-        BUILD_WITH_INSTALL_RPATH TRUE
-    )
-elseif(UNIX)
-    set_target_properties(logos-storage-cli PROPERTIES
-        INSTALL_RPATH "$ORIGIN/../lib"
-        BUILD_WITH_INSTALL_RPATH TRUE
-    )
-endif()
+# Set RPATH settings for each executable
+foreach(_target logos-uploader logos-downloader)
+    if(APPLE)
+        set_target_properties(${_target} PROPERTIES
+            INSTALL_RPATH "@executable_path/../lib"
+            BUILD_WITH_INSTALL_RPATH TRUE
+        )
+    elseif(UNIX)
+        set_target_properties(${_target} PROPERTIES
+            INSTALL_RPATH "$ORIGIN/../lib"
+            BUILD_WITH_INSTALL_RPATH TRUE
+        )
+    endif()
+endforeach()
 
 ########### RUNTIME LINKS END ###########
 
 ########### INSTALL ###########
 
 # Install rules
-install(TARGETS logos-storage-cli
+install(TARGETS logos-uploader logos-downloader
     RUNTIME DESTINATION bin
 )
 
diff --git a/cli/downloader.cpp b/cli/downloader.cpp
new file mode 100644
index 0000000..aa6836f
--- /dev/null
+++ b/cli/downloader.cpp
@@ -0,0 +1,48 @@
+#include "logos_manager.h"
+
+#include <QCoreApplication>
+#include <QDir>
+#include <iostream>
+
+int app_main(LogosModules* modules, int argc, char* argv[]);
+
+int main(int argc, char* argv[]) {
+    if (argc < 2) {
+        std::cerr << "Usage: " << argv[0] << " <upload|download> <arguments>" << std::endl;
+        return 1;
+    }
+
+    QCoreApplication app(argc, argv);
+    QCoreApplication::setOrganizationName("Logos");
+    QCoreApplication::setApplicationName("LogosStorageCLI");
+
+    Logos logos(QCoreApplication::applicationDirPath() + "/../modules");
+    if (!logos.init()) {
+        std::cerr << "Failed to initialize Logos" << std::endl;
+        return 1;
+    }
+
+    int result = app_main(logos.modules(), argc, argv);
+    logos.cleanup();
+    return result;
+}
+
+int app_main(LogosModules* modules, int argc, char* argv[]) {
+    if (argc < 4) {
+        std::cerr << "Usage: " << argv[0] << " <bootstrap-spr> <cid> <file>" << std::endl;
+        return 1;
+    }
+
+    const QString jsonConfig = "{"
+      "\"listen-addrs\": [\"/ip4/0.0.0.0/tcp/8001\"],"
+      "\"disc-port\": 9001,"
+      "\"nat\": \"none\""
+    "}";
+
+    if (!modules->storage_module.init(jsonConfig)) {
+        std::cerr << "Failed to initialize storage module" << std::endl;
+        return 1;
+    }
+
+    return 0;
+}
\ No newline at end of file
diff --git a/cli/main.cpp b/cli/uploader.cpp
similarity index 55%
rename from cli/main.cpp
rename to cli/uploader.cpp
index 62fc445..6e74275 100644
--- a/cli/main.cpp
+++ b/cli/uploader.cpp
@@ -3,11 +3,15 @@
 #include <QCoreApplication>
 #include <QDir>
 #include <iostream>
-#include <thread>
 
 int app_main(LogosModules* modules, int argc, char* argv[]);
 
 int main(int argc, char* argv[]) {
+    if (argc < 2) {
+        std::cerr << "Usage: " << argv[0] << " <upload|download> <arguments>" << std::endl;
+        return 1;
+    }
+
     QCoreApplication app(argc, argv);
     QCoreApplication::setOrganizationName("Logos");
     QCoreApplication::setApplicationName("LogosStorageCLI");
@@ -24,8 +28,21 @@ int main(int argc, char* argv[]) {
 }
 
 int app_main(LogosModules* modules, int argc, char* argv[]) {
-    // Your CLI application logic here
-    std::cout << "Running app" << std::endl;
-    std::this_thread::sleep_for(std::chrono::seconds(5));
+    if (argc < 2) {
+        std::cerr << "Usage: " << argv[0] << " <file>" << std::endl;
+        return 1;
+    }
+
+    const QString jsonConfig = "{"
+      "\"listen-addrs\": [\"/ip4/0.0.0.0/tcp/8000\"],"
+      "\"disc-port\": 9000,"
+      "\"nat\": \"none\""
+    "}";
+
+    if (!modules->storage_module.init(jsonConfig)) {
+        std::cerr << "Failed to initialize storage module" << std::endl;
+        return 1;
+    }
+
     return 0;
-}
\ No newline at end of file
+}
diff --git a/flake.nix b/flake.nix
index 122e27b..948e760 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,13 +28,13 @@
       packages = forAllSystems ({ pkgs, logosSdk, logosLiblogos, logosStorageModule, logosCapabilityModule }:
         let
           # Common configuration
-          common = import ./nix/default.nix { 
+          common = import ./nix/default.nix {
             inherit pkgs logosSdk logosLiblogos logosStorageModule;
           };
           src = ./.;
 
           # Library package
-          lib = import ./nix/lib.nix { 
+          lib = import ./nix/lib.nix {
             inherit pkgs common src logosStorageModule logosSdk;
           };
 
@@ -68,7 +68,7 @@
             pkgs.krb5
             pkgs.abseil-cpp
           ];
-          
+
           shellHook = ''
             export LOGOS_CPP_SDK_ROOT="${logosSdk}"
             export LOGOS_LIBLOGOS_ROOT="${logosLiblogos}"
diff --git a/nix/cli.nix b/nix/cli.nix
index 21b9e2d..e4c118f 100644
--- a/nix/cli.nix
+++ b/nix/cli.nix
@@ -126,12 +126,16 @@ pkgs.stdenv.mkDerivation rec {
 
     mkdir -p $out/bin $out/lib $out/modules $out/generated_code
 
-    # Install CLI binary
-    if [ -f "build/cli/bin/logos-storage-cli" ]; then
-      cp build/cli/bin/logos-storage-cli "$out/bin/"
-      echo "Installed logos-storage-cli binary"
+    if [ -f "build/cli/bin/logos-uploader" ]; then
+      cp build/cli/bin/logos-uploader "$out/bin/"
+      echo "Installed uploader binary"
     fi
 
+    #if [ -f "build/cli/bin/logos-downloader" ]; then
+      cp build/cli/bin/logos-downloader "$out/bin/"
+      echo "Installed downloader binary"
+    #fi
+
     # Copy the core binaries from liblogos
     if [ -f "${logosLiblogos}/bin/logoscore" ]; then
       cp -L "${logosLiblogos}/bin/logoscore" "$out/bin/"