finos · e117649 · Oct 15, 2025
diff --git a/.github/actions/run-test/action.yml b/.github/actions/run-test/action.yml
@@ -23,15 +23,15 @@ runs:
     - name: Run Unittests
       shell: bash
       run: |
-        python -m unittest discover -v tests
+        PYTHONPATH=src python -m unittest discover -v tests
 
     - name: Run Examples
       shell: bash
       run: |
         uv pip install --system -r examples/applications/requirements_applications.txt
         for example in "./examples"/*.py; do
           echo "Running $example"
-          PYTHONPATH=. python $example
+          PYTHONPATH=src python $example
         done
         for example in "./examples/applications"/*.py; do
           if python -c 'import sys; sys.exit(not sys.version_info <= (3, 10))'; then
@@ -42,5 +42,5 @@ runs:
           fi
 
           echo "Running $example"
-          PYTHONPATH=. python $example
+          PYTHONPATH=src python $example
         done
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,7 @@ if(NOT SKBUILD_PROJECT_NAME)
 endif()
 
 # Path to the version file
-set(VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/scaler/version.txt")
+set(VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/src/scaler/version.txt")
 
 # Check if the version file exists
 if(NOT EXISTS "${VERSION_FILE}")
@@ -118,8 +118,10 @@ message(STATUS "Python ABI: ${Python3_SOABI}")
 # Make LSP happy
 include_directories(${CAPNP_INCLUDE_DIRS})
 include_directories(${PROJECT_SOURCE_DIR})
+include_directories(${PROJECT_SOURCE_DIR}/src)
+include_directories(${PROJECT_SOURCE_DIR}/src/cpp)
 
-add_subdirectory(scaler)
+add_subdirectory(src/cpp/scaler)
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_subdirectory(tests)

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -13,15 +13,15 @@
 import os
 import sys
 
-sys.path.insert(0, os.path.abspath(os.path.join("..", "..")))
+sys.path.insert(0, os.path.abspath(os.path.join("..", "..", "src")))
 
 
 # -- Project information -----------------------------------------------------
 
 project = "OpenGRIS Scaler"
 author = "Citi"
 
-with open("../../scaler/version.txt", "rt") as f:
+with open("../../src/scaler/version.txt", "rt") as f:
     version = f.read().strip()
 
 release = f"{version}-py3-none-any"

diff --git a/pyproject.toml b/pyproject.toml
@@ -65,7 +65,13 @@ dev = [
 [tool.scikit-build.metadata.version]
 provider = "scikit_build_core.metadata.regex"
 regex = '(?P<value>\d+\.\d+\.\d+(\.[1-9]\d*)?)'
-input = "./scaler/version.txt"
+input = "./src/scaler/version.txt"
+
+[tool.setuptools]
+package-dir = {"" = "src"}
+
+[tool.setuptools.packages.find]
+where = ["src"]
 
 [project.urls]
 Home = "https://github.com/Citi/scaler"
@@ -81,7 +87,7 @@ scaler_worker_adapter_symphony = "scaler.entry_points.worker_adapter_symphony:ma
 
 [tool.scikit-build]
 cmake.source-dir = "."
-wheel.packages = ["scaler"]
+wheel.packages = ["src/scaler"]
 build.targets = ["py_ymq", "py_object_storage_server"]
 
 [tool.scikit-build.cmake.define]

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -12,8 +12,8 @@ BUILD_DIR="build_${OS}_${ARCH}"
 BUILD_PRESET="${OS}-${ARCH}"
 
 rm -rf $BUILD_DIR
-rm -f scaler/protocol/capnp/*.c++
-rm -f scaler/protocol/capnp/*.h
+rm -f src/scaler/protocol/capnp/*.c++
+rm -f src/scaler/protocol/capnp/*.h
 echo "Build directory: $BUILD_DIR"
 echo "Build preset: $BUILD_PRESET"
 

diff --git a/scaler/CMakeLists.txt → src/cpp/scaler/CMakeLists.txt b/scaler/CMakeLists.txt → src/cpp/scaler/CMakeLists.txt
diff --git a/scaler/io/ymq/CMakeLists.txt → src/cpp/scaler/io/ymq/CMakeLists.txt b/scaler/io/ymq/CMakeLists.txt → src/cpp/scaler/io/ymq/CMakeLists.txt
@@ -54,7 +54,7 @@ add_library(ymq_objs OBJECT
     simple_interface.cpp
 )
 
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/scaler/io/ymq)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/src/scaler/io/ymq)
 
 if(LINUX)
     # ymq python =======================================================================================================
@@ -70,7 +70,10 @@ if(LINUX)
         pymod_ymq/ymq.cpp
     )
 
-    # target_include_directories(py_ymq PRIVATE ${Python3_INCLUDE_DIRS})
+    target_include_directories(py_ymq PRIVATE
+        ${PROJECT_SOURCE_DIR}/src/cpp
+    )
+
     target_link_libraries(py_ymq PRIVATE
         $<$<CXX_COMPILER_ID:GNU,Clang>:-Wl,-Bstatic> ymq_objs
         $<$<CXX_COMPILER_ID:GNU,Clang>:-Wl,-Bdynamic>

diff --git a/scaler/io/ymq/bytes.h → src/cpp/scaler/io/ymq/bytes.h b/scaler/io/ymq/bytes.h → src/cpp/scaler/io/ymq/bytes.h
diff --git a/scaler/io/ymq/common.h → src/cpp/scaler/io/ymq/common.h b/scaler/io/ymq/common.h → src/cpp/scaler/io/ymq/common.h
diff --git a/scaler/io/ymq/configuration.h → src/cpp/scaler/io/ymq/configuration.h b/scaler/io/ymq/configuration.h → src/cpp/scaler/io/ymq/configuration.h
diff --git a/scaler/io/ymq/epoll_context.cpp → src/cpp/scaler/io/ymq/epoll_context.cpp b/scaler/io/ymq/epoll_context.cpp → src/cpp/scaler/io/ymq/epoll_context.cpp
diff --git a/scaler/io/ymq/epoll_context.h → src/cpp/scaler/io/ymq/epoll_context.h b/scaler/io/ymq/epoll_context.h → src/cpp/scaler/io/ymq/epoll_context.h
diff --git a/scaler/io/ymq/error.h → src/cpp/scaler/io/ymq/error.h b/scaler/io/ymq/error.h → src/cpp/scaler/io/ymq/error.h
diff --git a/scaler/io/ymq/event_loop.h → src/cpp/scaler/io/ymq/event_loop.h b/scaler/io/ymq/event_loop.h → src/cpp/scaler/io/ymq/event_loop.h
diff --git a/scaler/io/ymq/event_loop_thread.cpp → src/cpp/scaler/io/ymq/event_loop_thread.cpp b/scaler/io/ymq/event_loop_thread.cpp → src/cpp/scaler/io/ymq/event_loop_thread.cpp
diff --git a/scaler/io/ymq/event_loop_thread.h → src/cpp/scaler/io/ymq/event_loop_thread.h b/scaler/io/ymq/event_loop_thread.h → src/cpp/scaler/io/ymq/event_loop_thread.h
diff --git a/scaler/io/ymq/event_manager.h → src/cpp/scaler/io/ymq/event_manager.h b/scaler/io/ymq/event_manager.h → src/cpp/scaler/io/ymq/event_manager.h
diff --git a/...er/io/ymq/interruptive_concurrent_queue.h → ...er/io/ymq/interruptive_concurrent_queue.h b/...er/io/ymq/interruptive_concurrent_queue.h → ...er/io/ymq/interruptive_concurrent_queue.h
diff --git a/scaler/io/ymq/io_context.cpp → src/cpp/scaler/io/ymq/io_context.cpp b/scaler/io/ymq/io_context.cpp → src/cpp/scaler/io/ymq/io_context.cpp
diff --git a/scaler/io/ymq/io_context.h → src/cpp/scaler/io/ymq/io_context.h b/scaler/io/ymq/io_context.h → src/cpp/scaler/io/ymq/io_context.h
diff --git a/scaler/io/ymq/io_socket.cpp → src/cpp/scaler/io/ymq/io_socket.cpp b/scaler/io/ymq/io_socket.cpp → src/cpp/scaler/io/ymq/io_socket.cpp
diff --git a/scaler/io/ymq/io_socket.h → src/cpp/scaler/io/ymq/io_socket.h b/scaler/io/ymq/io_socket.h → src/cpp/scaler/io/ymq/io_socket.h
diff --git a/scaler/io/ymq/iocp_context.cpp → src/cpp/scaler/io/ymq/iocp_context.cpp b/scaler/io/ymq/iocp_context.cpp → src/cpp/scaler/io/ymq/iocp_context.cpp
diff --git a/scaler/io/ymq/iocp_context.h → src/cpp/scaler/io/ymq/iocp_context.h b/scaler/io/ymq/iocp_context.h → src/cpp/scaler/io/ymq/iocp_context.h
diff --git a/scaler/io/ymq/logging.h → src/cpp/scaler/io/ymq/logging.h b/scaler/io/ymq/logging.h → src/cpp/scaler/io/ymq/logging.h
diff --git a/scaler/io/ymq/message.h → src/cpp/scaler/io/ymq/message.h b/scaler/io/ymq/message.h → src/cpp/scaler/io/ymq/message.h
diff --git a/scaler/io/ymq/message_connection.h → src/cpp/scaler/io/ymq/message_connection.h b/scaler/io/ymq/message_connection.h → src/cpp/scaler/io/ymq/message_connection.h
diff --git a/scaler/io/ymq/message_connection_tcp.cpp → .../scaler/io/ymq/message_connection_tcp.cpp b/scaler/io/ymq/message_connection_tcp.cpp → .../scaler/io/ymq/message_connection_tcp.cpp
diff --git a/scaler/io/ymq/message_connection_tcp.h → ...pp/scaler/io/ymq/message_connection_tcp.h b/scaler/io/ymq/message_connection_tcp.h → ...pp/scaler/io/ymq/message_connection_tcp.h
diff --git a/scaler/io/ymq/network_utils.h → src/cpp/scaler/io/ymq/network_utils.h b/scaler/io/ymq/network_utils.h → src/cpp/scaler/io/ymq/network_utils.h
diff --git a/scaler/io/ymq/pymod_ymq/bytes.h → src/cpp/scaler/io/ymq/pymod_ymq/bytes.h b/scaler/io/ymq/pymod_ymq/bytes.h → src/cpp/scaler/io/ymq/pymod_ymq/bytes.h
diff --git a/scaler/io/ymq/pymod_ymq/exception.h → src/cpp/scaler/io/ymq/pymod_ymq/exception.h b/scaler/io/ymq/pymod_ymq/exception.h → src/cpp/scaler/io/ymq/pymod_ymq/exception.h
diff --git a/scaler/io/ymq/pymod_ymq/gil.h → src/cpp/scaler/io/ymq/pymod_ymq/gil.h b/scaler/io/ymq/pymod_ymq/gil.h → src/cpp/scaler/io/ymq/pymod_ymq/gil.h
diff --git a/scaler/io/ymq/pymod_ymq/io_context.h → src/cpp/scaler/io/ymq/pymod_ymq/io_context.h b/scaler/io/ymq/pymod_ymq/io_context.h → src/cpp/scaler/io/ymq/pymod_ymq/io_context.h
diff --git a/scaler/io/ymq/pymod_ymq/io_socket.h → src/cpp/scaler/io/ymq/pymod_ymq/io_socket.h b/scaler/io/ymq/pymod_ymq/io_socket.h → src/cpp/scaler/io/ymq/pymod_ymq/io_socket.h
diff --git a/scaler/io/ymq/pymod_ymq/message.h → src/cpp/scaler/io/ymq/pymod_ymq/message.h b/scaler/io/ymq/pymod_ymq/message.h → src/cpp/scaler/io/ymq/pymod_ymq/message.h
diff --git a/scaler/io/ymq/pymod_ymq/python.h → src/cpp/scaler/io/ymq/pymod_ymq/python.h b/scaler/io/ymq/pymod_ymq/python.h → src/cpp/scaler/io/ymq/pymod_ymq/python.h
diff --git a/scaler/io/ymq/pymod_ymq/ymq.cpp → src/cpp/scaler/io/ymq/pymod_ymq/ymq.cpp b/scaler/io/ymq/pymod_ymq/ymq.cpp → src/cpp/scaler/io/ymq/pymod_ymq/ymq.cpp
diff --git a/scaler/io/ymq/pymod_ymq/ymq.h → src/cpp/scaler/io/ymq/pymod_ymq/ymq.h b/scaler/io/ymq/pymod_ymq/ymq.h → src/cpp/scaler/io/ymq/pymod_ymq/ymq.h
@@ -15,6 +15,7 @@
 
 // First-party
 #include "scaler/io/ymq/error.h"
+#include "scaler/io/ymq/typedefs.h"
 
 struct YMQState {
     OwnedPyObject<> enumModule;     // Reference to the enum module

diff --git a/scaler/io/ymq/readme.md → src/cpp/scaler/io/ymq/readme.md b/scaler/io/ymq/readme.md → src/cpp/scaler/io/ymq/readme.md
diff --git a/scaler/io/ymq/simple_interface.cpp → src/cpp/scaler/io/ymq/simple_interface.cpp b/scaler/io/ymq/simple_interface.cpp → src/cpp/scaler/io/ymq/simple_interface.cpp
diff --git a/scaler/io/ymq/simple_interface.h → src/cpp/scaler/io/ymq/simple_interface.h b/scaler/io/ymq/simple_interface.h → src/cpp/scaler/io/ymq/simple_interface.h
diff --git a/scaler/io/ymq/tcp_client.cpp → src/cpp/scaler/io/ymq/tcp_client.cpp b/scaler/io/ymq/tcp_client.cpp → src/cpp/scaler/io/ymq/tcp_client.cpp
diff --git a/scaler/io/ymq/tcp_client.h → src/cpp/scaler/io/ymq/tcp_client.h b/scaler/io/ymq/tcp_client.h → src/cpp/scaler/io/ymq/tcp_client.h
diff --git a/scaler/io/ymq/tcp_operations.h → src/cpp/scaler/io/ymq/tcp_operations.h b/scaler/io/ymq/tcp_operations.h → src/cpp/scaler/io/ymq/tcp_operations.h
diff --git a/scaler/io/ymq/tcp_server.cpp → src/cpp/scaler/io/ymq/tcp_server.cpp b/scaler/io/ymq/tcp_server.cpp → src/cpp/scaler/io/ymq/tcp_server.cpp
diff --git a/scaler/io/ymq/tcp_server.h → src/cpp/scaler/io/ymq/tcp_server.h b/scaler/io/ymq/tcp_server.h → src/cpp/scaler/io/ymq/tcp_server.h
diff --git a/scaler/io/ymq/third_party/concurrentqueue.h → ...aler/io/ymq/third_party/concurrentqueue.h b/scaler/io/ymq/third_party/concurrentqueue.h → ...aler/io/ymq/third_party/concurrentqueue.h
diff --git a/scaler/io/ymq/timed_queue.h → src/cpp/scaler/io/ymq/timed_queue.h b/scaler/io/ymq/timed_queue.h → src/cpp/scaler/io/ymq/timed_queue.h
diff --git a/scaler/io/ymq/timestamp.h → src/cpp/scaler/io/ymq/timestamp.h b/scaler/io/ymq/timestamp.h → src/cpp/scaler/io/ymq/timestamp.h
diff --git a/scaler/io/ymq/typedefs.h → src/cpp/scaler/io/ymq/typedefs.h b/scaler/io/ymq/typedefs.h → src/cpp/scaler/io/ymq/typedefs.h
diff --git a/scaler/io/ymq/utils.h → src/cpp/scaler/io/ymq/utils.h b/scaler/io/ymq/utils.h → src/cpp/scaler/io/ymq/utils.h
diff --git a/scaler/object_storage/CMakeLists.txt → src/cpp/scaler/object_storage/CMakeLists.txt b/scaler/object_storage/CMakeLists.txt → src/cpp/scaler/object_storage/CMakeLists.txt
@@ -1,9 +1,9 @@
 # capnp_objs ===========================================================================================================
 # compile object storage schema capnp
-set(CAPNPC_SRC_PREFIX "${PROJECT_SOURCE_DIR}/scaler/protocol/capnp" CACHE STRING "" FORCE)
-set(CAPNPC_OUTPUT_DIR "${PROJECT_SOURCE_DIR}/scaler/protocol/capnp" CACHE STRING "" FORCE)
+set(CAPNPC_SRC_PREFIX "${PROJECT_SOURCE_DIR}/src/scaler/protocol/capnp" CACHE STRING "" FORCE)
+set(CAPNPC_OUTPUT_DIR "${PROJECT_SOURCE_DIR}/src/scaler/protocol/capnp" CACHE STRING "" FORCE)
 file(MAKE_DIRECTORY "${CAPNPC_OUTPUT_DIR}")
-capnp_generate_cpp(OBJECT_STORAGE_CAPNP_SRCS OBJECT_STORAGE_CAPNP_HEADERS "../protocol/capnp/object_storage.capnp")
+capnp_generate_cpp(OBJECT_STORAGE_CAPNP_SRCS OBJECT_STORAGE_CAPNP_HEADERS "${PROJECT_SOURCE_DIR}/src/scaler/protocol/capnp/object_storage.capnp")
 
 add_library(capnp_objs OBJECT
     ${OBJECT_STORAGE_CAPNP_SRCS}
@@ -18,7 +18,7 @@ add_library(object_storage_server_objs OBJECT
     object_manager.cpp
 )
 
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/scaler/object_storage)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/src/scaler/object_storage)
 
 # object_storage_server python =========================================================================================
 add_library(py_object_storage_server MODULE
@@ -30,6 +30,10 @@ set_target_properties(py_object_storage_server PROPERTIES
     OUTPUT_NAME "object_storage_server"
 )
 
+target_include_directories(py_object_storage_server PRIVATE
+    ${PROJECT_SOURCE_DIR}/src/cpp
+)
+
 target_link_libraries(py_object_storage_server PRIVATE
     capnp_objs
     ymq_objs

diff --git a/scaler/object_storage/constants.h → src/cpp/scaler/object_storage/constants.h b/scaler/object_storage/constants.h → src/cpp/scaler/object_storage/constants.h
diff --git a/scaler/object_storage/defs.h → src/cpp/scaler/object_storage/defs.h b/scaler/object_storage/defs.h → src/cpp/scaler/object_storage/defs.h
diff --git a/scaler/object_storage/io_helper.cpp → src/cpp/scaler/object_storage/io_helper.cpp b/scaler/object_storage/io_helper.cpp → src/cpp/scaler/object_storage/io_helper.cpp
@@ -1,4 +1,4 @@
-#include "io_helper.h"
+#include "scaler/object_storage/io_helper.h"
 
 #include <netinet/in.h>  // sockaddr_in
 #include <sys/socket.h>  // socket(2)

diff --git a/scaler/object_storage/io_helper.h → src/cpp/scaler/object_storage/io_helper.h b/scaler/object_storage/io_helper.h → src/cpp/scaler/object_storage/io_helper.h
diff --git a/scaler/object_storage/message.cpp → src/cpp/scaler/object_storage/message.cpp b/scaler/object_storage/message.cpp → src/cpp/scaler/object_storage/message.cpp
diff --git a/scaler/object_storage/message.h → src/cpp/scaler/object_storage/message.h b/scaler/object_storage/message.h → src/cpp/scaler/object_storage/message.h
@@ -6,7 +6,7 @@
 #include <cstdio>
 #include <vector>
 
-#include "../protocol/capnp/object_storage.capnp.h"
+#include "scaler/protocol/capnp/object_storage.capnp.h"
 
 namespace scaler {
 namespace object_storage {

diff --git a/scaler/object_storage/object_manager.cpp → .../scaler/object_storage/object_manager.cpp b/scaler/object_storage/object_manager.cpp → .../scaler/object_storage/object_manager.cpp
diff --git a/scaler/object_storage/object_manager.h → ...pp/scaler/object_storage/object_manager.h b/scaler/object_storage/object_manager.h → ...pp/scaler/object_storage/object_manager.h
diff --git a/.../object_storage/object_storage_server.cpp → .../object_storage/object_storage_server.cpp b/.../object_storage/object_storage_server.cpp → .../object_storage/object_storage_server.cpp
diff --git a/...er/object_storage/object_storage_server.h → ...er/object_storage/object_storage_server.h b/...er/object_storage/object_storage_server.h → ...er/object_storage/object_storage_server.h
diff --git a/...t_storage/pymod_object_storage_server.cpp → ...t_storage/pymod_object_storage_server.cpp b/...t_storage/pymod_object_storage_server.cpp → ...t_storage/pymod_object_storage_server.cpp
diff --git a/run_cluster.py → src/run_cluster.py b/run_cluster.py → src/run_cluster.py
diff --git a/run_object_storage_server.py → src/run_object_storage_server.py b/run_object_storage_server.py → src/run_object_storage_server.py
diff --git a/run_scheduler.py → src/run_scheduler.py b/run_scheduler.py → src/run_scheduler.py
diff --git a/run_top.py → src/run_top.py b/run_top.py → src/run_top.py
diff --git a/run_webui.py → src/run_webui.py b/run_webui.py → src/run_webui.py
diff --git a/run_worker_adapter_native.py → src/run_worker_adapter_native.py b/run_worker_adapter_native.py → src/run_worker_adapter_native.py
diff --git a/run_worker_adapter_symphony.py → src/run_worker_adapter_symphony.py b/run_worker_adapter_symphony.py → src/run_worker_adapter_symphony.py
diff --git a/scaler/__init__.py → src/scaler/__init__.py b/scaler/__init__.py → src/scaler/__init__.py
diff --git a/scaler/about.py → src/scaler/about.py b/scaler/about.py → src/scaler/about.py
diff --git a/scaler/client/__init__.py → src/scaler/client/__init__.py b/scaler/client/__init__.py → src/scaler/client/__init__.py
diff --git a/scaler/client/agent/__init__.py → src/scaler/client/agent/__init__.py b/scaler/client/agent/__init__.py → src/scaler/client/agent/__init__.py
diff --git a/scaler/client/agent/client_agent.py → src/scaler/client/agent/client_agent.py b/scaler/client/agent/client_agent.py → src/scaler/client/agent/client_agent.py
diff --git a/scaler/client/agent/disconnect_manager.py → ...scaler/client/agent/disconnect_manager.py b/scaler/client/agent/disconnect_manager.py → ...scaler/client/agent/disconnect_manager.py
diff --git a/scaler/client/agent/future_manager.py → src/scaler/client/agent/future_manager.py b/scaler/client/agent/future_manager.py → src/scaler/client/agent/future_manager.py
diff --git a/scaler/client/agent/heartbeat_manager.py → src/scaler/client/agent/heartbeat_manager.py b/scaler/client/agent/heartbeat_manager.py → src/scaler/client/agent/heartbeat_manager.py
diff --git a/scaler/client/agent/mixins.py → src/scaler/client/agent/mixins.py b/scaler/client/agent/mixins.py → src/scaler/client/agent/mixins.py
diff --git a/scaler/client/agent/object_manager.py → src/scaler/client/agent/object_manager.py b/scaler/client/agent/object_manager.py → src/scaler/client/agent/object_manager.py
diff --git a/scaler/client/agent/task_manager.py → src/scaler/client/agent/task_manager.py b/scaler/client/agent/task_manager.py → src/scaler/client/agent/task_manager.py
diff --git a/scaler/client/client.py → src/scaler/client/client.py b/scaler/client/client.py → src/scaler/client/client.py
diff --git a/scaler/client/future.py → src/scaler/client/future.py b/scaler/client/future.py → src/scaler/client/future.py
diff --git a/scaler/client/object_buffer.py → src/scaler/client/object_buffer.py b/scaler/client/object_buffer.py → src/scaler/client/object_buffer.py
diff --git a/scaler/client/object_reference.py → src/scaler/client/object_reference.py b/scaler/client/object_reference.py → src/scaler/client/object_reference.py
diff --git a/scaler/client/serializer/__init__.py → src/scaler/client/serializer/__init__.py b/scaler/client/serializer/__init__.py → src/scaler/client/serializer/__init__.py
diff --git a/scaler/client/serializer/default.py → src/scaler/client/serializer/default.py b/scaler/client/serializer/default.py → src/scaler/client/serializer/default.py
diff --git a/scaler/client/serializer/mixins.py → src/scaler/client/serializer/mixins.py b/scaler/client/serializer/mixins.py → src/scaler/client/serializer/mixins.py
diff --git a/scaler/cluster/__init__.py → src/scaler/cluster/__init__.py b/scaler/cluster/__init__.py → src/scaler/cluster/__init__.py
diff --git a/scaler/cluster/cluster.py → src/scaler/cluster/cluster.py b/scaler/cluster/cluster.py → src/scaler/cluster/cluster.py
diff --git a/scaler/cluster/combo.py → src/scaler/cluster/combo.py b/scaler/cluster/combo.py → src/scaler/cluster/combo.py
diff --git a/scaler/cluster/object_storage_server.py → src/scaler/cluster/object_storage_server.py b/scaler/cluster/object_storage_server.py → src/scaler/cluster/object_storage_server.py
diff --git a/scaler/cluster/scheduler.py → src/scaler/cluster/scheduler.py b/scaler/cluster/scheduler.py → src/scaler/cluster/scheduler.py
diff --git a/scaler/config/__init__.py → src/scaler/config/__init__.py b/scaler/config/__init__.py → src/scaler/config/__init__.py
diff --git a/scaler/config/defaults.py → src/scaler/config/defaults.py b/scaler/config/defaults.py → src/scaler/config/defaults.py
diff --git a/scaler/config/loader.py → src/scaler/config/loader.py b/scaler/config/loader.py → src/scaler/config/loader.py
diff --git a/scaler/config/mixins.py → src/scaler/config/mixins.py b/scaler/config/mixins.py → src/scaler/config/mixins.py
diff --git a/scaler/config/section/__init__.py → src/scaler/config/section/__init__.py b/scaler/config/section/__init__.py → src/scaler/config/section/__init__.py
diff --git a/scaler/config/section/cluster.py → src/scaler/config/section/cluster.py b/scaler/config/section/cluster.py → src/scaler/config/section/cluster.py
diff --git a/...r/config/section/native_worker_adapter.py → ...r/config/section/native_worker_adapter.py b/...r/config/section/native_worker_adapter.py → ...r/config/section/native_worker_adapter.py
diff --git a/...r/config/section/object_storage_server.py → ...r/config/section/object_storage_server.py b/...r/config/section/object_storage_server.py → ...r/config/section/object_storage_server.py
diff --git a/scaler/config/section/scheduler.py → src/scaler/config/section/scheduler.py b/scaler/config/section/scheduler.py → src/scaler/config/section/scheduler.py
diff --git a/...config/section/symphony_worker_adapter.py → ...config/section/symphony_worker_adapter.py b/...config/section/symphony_worker_adapter.py → ...config/section/symphony_worker_adapter.py
diff --git a/scaler/config/section/top.py → src/scaler/config/section/top.py b/scaler/config/section/top.py → src/scaler/config/section/top.py
diff --git a/scaler/config/section/webui.py → src/scaler/config/section/webui.py b/scaler/config/section/webui.py → src/scaler/config/section/webui.py
diff --git a/scaler/config/types/__init__.py → src/scaler/config/types/__init__.py b/scaler/config/types/__init__.py → src/scaler/config/types/__init__.py
diff --git a/scaler/config/types/network_backend.py → src/scaler/config/types/network_backend.py b/scaler/config/types/network_backend.py → src/scaler/config/types/network_backend.py
diff --git a/scaler/config/types/object_storage_server.py → ...ler/config/types/object_storage_server.py b/scaler/config/types/object_storage_server.py → ...ler/config/types/object_storage_server.py
diff --git a/scaler/config/types/worker.py → src/scaler/config/types/worker.py b/scaler/config/types/worker.py → src/scaler/config/types/worker.py
diff --git a/scaler/config/types/zmq.py → src/scaler/config/types/zmq.py b/scaler/config/types/zmq.py → src/scaler/config/types/zmq.py
diff --git a/scaler/entry_points/__init__.py → src/scaler/entry_points/__init__.py b/scaler/entry_points/__init__.py → src/scaler/entry_points/__init__.py
diff --git a/scaler/entry_points/cluster.py → src/scaler/entry_points/cluster.py b/scaler/entry_points/cluster.py → src/scaler/entry_points/cluster.py
diff --git a/scaler/entry_points/object_storage_server.py → ...ler/entry_points/object_storage_server.py b/scaler/entry_points/object_storage_server.py → ...ler/entry_points/object_storage_server.py
diff --git a/scaler/entry_points/scheduler.py → src/scaler/entry_points/scheduler.py b/scaler/entry_points/scheduler.py → src/scaler/entry_points/scheduler.py
diff --git a/scaler/entry_points/top.py → src/scaler/entry_points/top.py b/scaler/entry_points/top.py → src/scaler/entry_points/top.py
diff --git a/scaler/entry_points/webui.py → src/scaler/entry_points/webui.py b/scaler/entry_points/webui.py → src/scaler/entry_points/webui.py
diff --git a/scaler/entry_points/worker_adapter_native.py → ...ler/entry_points/worker_adapter_native.py b/scaler/entry_points/worker_adapter_native.py → ...ler/entry_points/worker_adapter_native.py
diff --git a/...r/entry_points/worker_adapter_symphony.py → ...r/entry_points/worker_adapter_symphony.py b/...r/entry_points/worker_adapter_symphony.py → ...r/entry_points/worker_adapter_symphony.py
diff --git a/scaler/io/__init__.py → src/scaler/io/__init__.py b/scaler/io/__init__.py → src/scaler/io/__init__.py
diff --git a/scaler/io/async_binder.py → src/scaler/io/async_binder.py b/scaler/io/async_binder.py → src/scaler/io/async_binder.py
diff --git a/scaler/io/async_connector.py → src/scaler/io/async_connector.py b/scaler/io/async_connector.py → src/scaler/io/async_connector.py
diff --git a/scaler/io/async_object_storage_connector.py → ...aler/io/async_object_storage_connector.py b/scaler/io/async_object_storage_connector.py → ...aler/io/async_object_storage_connector.py
diff --git a/scaler/io/mixins.py → src/scaler/io/mixins.py b/scaler/io/mixins.py → src/scaler/io/mixins.py
diff --git a/scaler/io/sync_connector.py → src/scaler/io/sync_connector.py b/scaler/io/sync_connector.py → src/scaler/io/sync_connector.py
diff --git a/scaler/io/sync_object_storage_connector.py → ...caler/io/sync_object_storage_connector.py b/scaler/io/sync_object_storage_connector.py → ...caler/io/sync_object_storage_connector.py
diff --git a/scaler/io/sync_subscriber.py → src/scaler/io/sync_subscriber.py b/scaler/io/sync_subscriber.py → src/scaler/io/sync_subscriber.py
diff --git a/scaler/io/utility.py → src/scaler/io/utility.py b/scaler/io/utility.py → src/scaler/io/utility.py
diff --git a/scaler/io/ymq/__init__.py → src/scaler/io/ymq/__init__.py b/scaler/io/ymq/__init__.py → src/scaler/io/ymq/__init__.py
diff --git a/scaler/io/ymq/_ymq.pyi → src/scaler/io/ymq/_ymq.pyi b/scaler/io/ymq/_ymq.pyi → src/scaler/io/ymq/_ymq.pyi
diff --git a/scaler/io/ymq/ymq.py → src/scaler/io/ymq/ymq.py b/scaler/io/ymq/ymq.py → src/scaler/io/ymq/ymq.py
diff --git a/.../io/ymq_async_object_storage_connector.py → .../io/ymq_async_object_storage_connector.py b/.../io/ymq_async_object_storage_connector.py → .../io/ymq_async_object_storage_connector.py
diff --git a/...r/io/ymq_sync_object_storage_connector.py → ...r/io/ymq_sync_object_storage_connector.py b/...r/io/ymq_sync_object_storage_connector.py → ...r/io/ymq_sync_object_storage_connector.py
diff --git a/scaler/object_storage/__init__.py → src/scaler/object_storage/__init__.py b/scaler/object_storage/__init__.py → src/scaler/object_storage/__init__.py
diff --git a/scaler/protocol/__init__.py → src/scaler/protocol/__init__.py b/scaler/protocol/__init__.py → src/scaler/protocol/__init__.py
diff --git a/scaler/protocol/capnp/__init__.py → src/scaler/protocol/capnp/__init__.py b/scaler/protocol/capnp/__init__.py → src/scaler/protocol/capnp/__init__.py
diff --git a/scaler/protocol/capnp/_python.py → src/scaler/protocol/capnp/_python.py b/scaler/protocol/capnp/_python.py → src/scaler/protocol/capnp/_python.py
diff --git a/scaler/protocol/capnp/common.capnp → src/scaler/protocol/capnp/common.capnp b/scaler/protocol/capnp/common.capnp → src/scaler/protocol/capnp/common.capnp
diff --git a/scaler/protocol/capnp/message.capnp → src/scaler/protocol/capnp/message.capnp b/scaler/protocol/capnp/message.capnp → src/scaler/protocol/capnp/message.capnp
diff --git a/scaler/protocol/capnp/object_storage.capnp → ...caler/protocol/capnp/object_storage.capnp b/scaler/protocol/capnp/object_storage.capnp → ...caler/protocol/capnp/object_storage.capnp
diff --git a/scaler/protocol/capnp/status.capnp → src/scaler/protocol/capnp/status.capnp b/scaler/protocol/capnp/status.capnp → src/scaler/protocol/capnp/status.capnp
diff --git a/scaler/protocol/introduction.md → src/scaler/protocol/introduction.md b/scaler/protocol/introduction.md → src/scaler/protocol/introduction.md
diff --git a/scaler/protocol/python/__init__.py → src/scaler/protocol/python/__init__.py b/scaler/protocol/python/__init__.py → src/scaler/protocol/python/__init__.py
diff --git a/scaler/protocol/python/common.py → src/scaler/protocol/python/common.py b/scaler/protocol/python/common.py → src/scaler/protocol/python/common.py
diff --git a/scaler/protocol/python/message.py → src/scaler/protocol/python/message.py b/scaler/protocol/python/message.py → src/scaler/protocol/python/message.py
diff --git a/scaler/protocol/python/mixins.py → src/scaler/protocol/python/mixins.py b/scaler/protocol/python/mixins.py → src/scaler/protocol/python/mixins.py
diff --git a/scaler/protocol/python/object_storage.py → src/scaler/protocol/python/object_storage.py b/scaler/protocol/python/object_storage.py → src/scaler/protocol/python/object_storage.py
diff --git a/scaler/protocol/python/status.py → src/scaler/protocol/python/status.py b/scaler/protocol/python/status.py → src/scaler/protocol/python/status.py
diff --git a/scaler/protocol/worker.md → src/scaler/protocol/worker.md b/scaler/protocol/worker.md → src/scaler/protocol/worker.md
diff --git a/scaler/scheduler/__init__.py → src/scaler/scheduler/__init__.py b/scaler/scheduler/__init__.py → src/scaler/scheduler/__init__.py
diff --git a/scaler/scheduler/allocate_policy/__init__.py → ...ler/scheduler/allocate_policy/__init__.py b/scaler/scheduler/allocate_policy/__init__.py → ...ler/scheduler/allocate_policy/__init__.py
diff --git a/...eduler/allocate_policy/allocate_policy.py → ...eduler/allocate_policy/allocate_policy.py b/...eduler/allocate_policy/allocate_policy.py → ...eduler/allocate_policy/allocate_policy.py
diff --git a/...cate_policy/capability_allocate_policy.py → ...cate_policy/capability_allocate_policy.py b/...cate_policy/capability_allocate_policy.py → ...cate_policy/capability_allocate_policy.py
diff --git a/...ocate_policy/even_load_allocate_policy.py → ...ocate_policy/even_load_allocate_policy.py b/...ocate_policy/even_load_allocate_policy.py → ...ocate_policy/even_load_allocate_policy.py
diff --git a/scaler/scheduler/allocate_policy/mixins.py → ...caler/scheduler/allocate_policy/mixins.py b/scaler/scheduler/allocate_policy/mixins.py → ...caler/scheduler/allocate_policy/mixins.py
diff --git a/scaler/scheduler/controllers/__init__.py → src/scaler/scheduler/controllers/__init__.py b/scaler/scheduler/controllers/__init__.py → src/scaler/scheduler/controllers/__init__.py
diff --git a/...heduler/controllers/balance_controller.py → ...heduler/controllers/balance_controller.py b/...heduler/controllers/balance_controller.py → ...heduler/controllers/balance_controller.py
diff --git a/...cheduler/controllers/client_controller.py → ...cheduler/controllers/client_controller.py b/...cheduler/controllers/client_controller.py → ...cheduler/controllers/client_controller.py
diff --git a/...cheduler/controllers/config_controller.py → ...cheduler/controllers/config_controller.py b/...cheduler/controllers/config_controller.py → ...cheduler/controllers/config_controller.py
diff --git a/...scheduler/controllers/graph_controller.py → ...scheduler/controllers/graph_controller.py b/...scheduler/controllers/graph_controller.py → ...scheduler/controllers/graph_controller.py
diff --git a/...ler/controllers/information_controller.py → ...ler/controllers/information_controller.py b/...ler/controllers/information_controller.py → ...ler/controllers/information_controller.py
diff --git a/scaler/scheduler/controllers/mixins.py → src/scaler/scheduler/controllers/mixins.py b/scaler/scheduler/controllers/mixins.py → src/scaler/scheduler/controllers/mixins.py
diff --git a/...cheduler/controllers/object_controller.py → ...cheduler/controllers/object_controller.py b/...cheduler/controllers/object_controller.py → ...cheduler/controllers/object_controller.py
diff --git a/...heduler/controllers/scaling_controller.py → ...heduler/controllers/scaling_controller.py b/...heduler/controllers/scaling_controller.py → ...heduler/controllers/scaling_controller.py
diff --git a/.../scheduler/controllers/task_controller.py → .../scheduler/controllers/task_controller.py b/.../scheduler/controllers/task_controller.py → .../scheduler/controllers/task_controller.py
diff --git a/...cheduler/controllers/worker_controller.py → ...cheduler/controllers/worker_controller.py b/...cheduler/controllers/worker_controller.py → ...cheduler/controllers/worker_controller.py
diff --git a/scaler/scheduler/object_usage/__init__.py → ...scaler/scheduler/object_usage/__init__.py b/scaler/scheduler/object_usage/__init__.py → ...scaler/scheduler/object_usage/__init__.py
diff --git a/.../scheduler/object_usage/object_tracker.py → .../scheduler/object_usage/object_tracker.py b/.../scheduler/object_usage/object_tracker.py → .../scheduler/object_usage/object_tracker.py
diff --git a/scaler/scheduler/scheduler.py → src/scaler/scheduler/scheduler.py b/scaler/scheduler/scheduler.py → src/scaler/scheduler/scheduler.py
diff --git a/scaler/scheduler/task/__init__.py → src/scaler/scheduler/task/__init__.py b/scaler/scheduler/task/__init__.py → src/scaler/scheduler/task/__init__.py
diff --git a/scaler/scheduler/task/task_state_machine.py → ...aler/scheduler/task/task_state_machine.py b/scaler/scheduler/task/task_state_machine.py → ...aler/scheduler/task/task_state_machine.py
diff --git a/scaler/scheduler/task/task_state_manager.py → ...aler/scheduler/task/task_state_manager.py b/scaler/scheduler/task/task_state_manager.py → ...aler/scheduler/task/task_state_manager.py
diff --git a/scaler/ui/__init__.py → src/scaler/ui/__init__.py b/scaler/ui/__init__.py → src/scaler/ui/__init__.py
diff --git a/scaler/ui/constants.py → src/scaler/ui/constants.py b/scaler/ui/constants.py → src/scaler/ui/constants.py
diff --git a/scaler/ui/live_display.py → src/scaler/ui/live_display.py b/scaler/ui/live_display.py → src/scaler/ui/live_display.py
diff --git a/scaler/ui/memory_window.py → src/scaler/ui/memory_window.py b/scaler/ui/memory_window.py → src/scaler/ui/memory_window.py
diff --git a/scaler/ui/setting_page.py → src/scaler/ui/setting_page.py b/scaler/ui/setting_page.py → src/scaler/ui/setting_page.py
diff --git a/scaler/ui/task_graph.py → src/scaler/ui/task_graph.py b/scaler/ui/task_graph.py → src/scaler/ui/task_graph.py
diff --git a/scaler/ui/task_log.py → src/scaler/ui/task_log.py b/scaler/ui/task_log.py → src/scaler/ui/task_log.py
diff --git a/scaler/ui/utility.py → src/scaler/ui/utility.py b/scaler/ui/utility.py → src/scaler/ui/utility.py
diff --git a/scaler/ui/webui.py → src/scaler/ui/webui.py b/scaler/ui/webui.py → src/scaler/ui/webui.py
diff --git a/scaler/ui/worker_processors.py → src/scaler/ui/worker_processors.py b/scaler/ui/worker_processors.py → src/scaler/ui/worker_processors.py
diff --git a/scaler/utility/__init__.py → src/scaler/utility/__init__.py b/scaler/utility/__init__.py → src/scaler/utility/__init__.py
diff --git a/scaler/utility/debug.py → src/scaler/utility/debug.py b/scaler/utility/debug.py → src/scaler/utility/debug.py
diff --git a/scaler/utility/event_list.py → src/scaler/utility/event_list.py b/scaler/utility/event_list.py → src/scaler/utility/event_list.py
diff --git a/scaler/utility/event_loop.py → src/scaler/utility/event_loop.py b/scaler/utility/event_loop.py → src/scaler/utility/event_loop.py
diff --git a/scaler/utility/exceptions.py → src/scaler/utility/exceptions.py b/scaler/utility/exceptions.py → src/scaler/utility/exceptions.py
diff --git a/scaler/utility/formatter.py → src/scaler/utility/formatter.py b/scaler/utility/formatter.py → src/scaler/utility/formatter.py
diff --git a/scaler/utility/graph/__init__.py → src/scaler/utility/graph/__init__.py b/scaler/utility/graph/__init__.py → src/scaler/utility/graph/__init__.py
diff --git a/scaler/utility/graph/optimization.py → src/scaler/utility/graph/optimization.py b/scaler/utility/graph/optimization.py → src/scaler/utility/graph/optimization.py
diff --git a/scaler/utility/graph/topological_sorter.py → ...caler/utility/graph/topological_sorter.py b/scaler/utility/graph/topological_sorter.py → ...caler/utility/graph/topological_sorter.py
diff --git a/...ity/graph/topological_sorter_graphblas.py → ...ity/graph/topological_sorter_graphblas.py b/...ity/graph/topological_sorter_graphblas.py → ...ity/graph/topological_sorter_graphblas.py
diff --git a/scaler/utility/identifiers.py → src/scaler/utility/identifiers.py b/scaler/utility/identifiers.py → src/scaler/utility/identifiers.py
diff --git a/scaler/utility/logging/__init__.py → src/scaler/utility/logging/__init__.py b/scaler/utility/logging/__init__.py → src/scaler/utility/logging/__init__.py
diff --git a/scaler/utility/logging/decorators.py → src/scaler/utility/logging/decorators.py b/scaler/utility/logging/decorators.py → src/scaler/utility/logging/decorators.py
diff --git a/scaler/utility/logging/scoped_logger.py → src/scaler/utility/logging/scoped_logger.py b/scaler/utility/logging/scoped_logger.py → src/scaler/utility/logging/scoped_logger.py
diff --git a/scaler/utility/logging/utility.py → src/scaler/utility/logging/utility.py b/scaler/utility/logging/utility.py → src/scaler/utility/logging/utility.py
diff --git a/scaler/utility/many_to_many_dict.py → src/scaler/utility/many_to_many_dict.py b/scaler/utility/many_to_many_dict.py → src/scaler/utility/many_to_many_dict.py
diff --git a/scaler/utility/metadata/__init__.py → src/scaler/utility/metadata/__init__.py b/scaler/utility/metadata/__init__.py → src/scaler/utility/metadata/__init__.py
diff --git a/scaler/utility/metadata/profile_result.py → ...scaler/utility/metadata/profile_result.py b/scaler/utility/metadata/profile_result.py → ...scaler/utility/metadata/profile_result.py
diff --git a/scaler/utility/metadata/task_flags.py → src/scaler/utility/metadata/task_flags.py b/scaler/utility/metadata/task_flags.py → src/scaler/utility/metadata/task_flags.py
diff --git a/scaler/utility/mixins.py → src/scaler/utility/mixins.py b/scaler/utility/mixins.py → src/scaler/utility/mixins.py
diff --git a/scaler/utility/network_util.py → src/scaler/utility/network_util.py b/scaler/utility/network_util.py → src/scaler/utility/network_util.py
diff --git a/scaler/utility/one_to_many_dict.py → src/scaler/utility/one_to_many_dict.py b/scaler/utility/one_to_many_dict.py → src/scaler/utility/one_to_many_dict.py
diff --git a/scaler/utility/queues/__init__.py → src/scaler/utility/queues/__init__.py b/scaler/utility/queues/__init__.py → src/scaler/utility/queues/__init__.py
diff --git a/scaler/utility/queues/async_indexed_queue.py → ...ler/utility/queues/async_indexed_queue.py b/scaler/utility/queues/async_indexed_queue.py → ...ler/utility/queues/async_indexed_queue.py
diff --git a/...er/utility/queues/async_priority_queue.py → ...er/utility/queues/async_priority_queue.py b/...er/utility/queues/async_priority_queue.py → ...er/utility/queues/async_priority_queue.py
diff --git a/...ity/queues/async_sorted_priority_queue.py → ...ity/queues/async_sorted_priority_queue.py b/...ity/queues/async_sorted_priority_queue.py → ...ity/queues/async_sorted_priority_queue.py
diff --git a/scaler/utility/queues/indexed_queue.py → src/scaler/utility/queues/indexed_queue.py b/scaler/utility/queues/indexed_queue.py → src/scaler/utility/queues/indexed_queue.py
diff --git a/scaler/utility/serialization.py → src/scaler/utility/serialization.py b/scaler/utility/serialization.py → src/scaler/utility/serialization.py
diff --git a/scaler/version.txt → src/scaler/version.txt b/scaler/version.txt → src/scaler/version.txt
diff --git a/scaler/worker/__init__.py → src/scaler/worker/__init__.py b/scaler/worker/__init__.py → src/scaler/worker/__init__.py
diff --git a/scaler/worker/agent/__init__.py → src/scaler/worker/agent/__init__.py b/scaler/worker/agent/__init__.py → src/scaler/worker/agent/__init__.py
diff --git a/scaler/worker/agent/heartbeat_manager.py → src/scaler/worker/agent/heartbeat_manager.py b/scaler/worker/agent/heartbeat_manager.py → src/scaler/worker/agent/heartbeat_manager.py
diff --git a/scaler/worker/agent/mixins.py → src/scaler/worker/agent/mixins.py b/scaler/worker/agent/mixins.py → src/scaler/worker/agent/mixins.py
diff --git a/scaler/worker/agent/processor/__init__.py → ...scaler/worker/agent/processor/__init__.py b/scaler/worker/agent/processor/__init__.py → ...scaler/worker/agent/processor/__init__.py
diff --git a/...er/worker/agent/processor/object_cache.py → ...er/worker/agent/processor/object_cache.py b/...er/worker/agent/processor/object_cache.py → ...er/worker/agent/processor/object_cache.py
diff --git a/scaler/worker/agent/processor/processor.py → ...caler/worker/agent/processor/processor.py b/scaler/worker/agent/processor/processor.py → ...caler/worker/agent/processor/processor.py
diff --git a/...orker/agent/processor/streaming_buffer.py → ...orker/agent/processor/streaming_buffer.py b/...orker/agent/processor/streaming_buffer.py → ...orker/agent/processor/streaming_buffer.py
diff --git a/scaler/worker/agent/processor_holder.py → src/scaler/worker/agent/processor_holder.py b/scaler/worker/agent/processor_holder.py → src/scaler/worker/agent/processor_holder.py
diff --git a/scaler/worker/agent/processor_manager.py → src/scaler/worker/agent/processor_manager.py b/scaler/worker/agent/processor_manager.py → src/scaler/worker/agent/processor_manager.py
diff --git a/scaler/worker/agent/profiling_manager.py → src/scaler/worker/agent/profiling_manager.py b/scaler/worker/agent/profiling_manager.py → src/scaler/worker/agent/profiling_manager.py
diff --git a/scaler/worker/agent/task_manager.py → src/scaler/worker/agent/task_manager.py b/scaler/worker/agent/task_manager.py → src/scaler/worker/agent/task_manager.py
diff --git a/scaler/worker/agent/timeout_manager.py → src/scaler/worker/agent/timeout_manager.py b/scaler/worker/agent/timeout_manager.py → src/scaler/worker/agent/timeout_manager.py
diff --git a/scaler/worker/preload.py → src/scaler/worker/preload.py b/scaler/worker/preload.py → src/scaler/worker/preload.py
diff --git a/scaler/worker/worker.py → src/scaler/worker/worker.py b/scaler/worker/worker.py → src/scaler/worker/worker.py
diff --git a/scaler/worker_adapter/__init__.py → src/scaler/worker_adapter/__init__.py b/scaler/worker_adapter/__init__.py → src/scaler/worker_adapter/__init__.py
diff --git a/scaler/worker_adapter/native.py → src/scaler/worker_adapter/native.py b/scaler/worker_adapter/native.py → src/scaler/worker_adapter/native.py
diff --git a/scaler/worker_adapter/symphony/__init__.py → ...caler/worker_adapter/symphony/__init__.py b/scaler/worker_adapter/symphony/__init__.py → ...caler/worker_adapter/symphony/__init__.py
diff --git a/scaler/worker_adapter/symphony/callback.py → ...caler/worker_adapter/symphony/callback.py b/scaler/worker_adapter/symphony/callback.py → ...caler/worker_adapter/symphony/callback.py
diff --git a/...ker_adapter/symphony/heartbeat_manager.py → ...ker_adapter/symphony/heartbeat_manager.py b/...ker_adapter/symphony/heartbeat_manager.py → ...ker_adapter/symphony/heartbeat_manager.py
diff --git a/scaler/worker_adapter/symphony/message.py → ...scaler/worker_adapter/symphony/message.py b/scaler/worker_adapter/symphony/message.py → ...scaler/worker_adapter/symphony/message.py
diff --git a/...r/worker_adapter/symphony/task_manager.py → ...r/worker_adapter/symphony/task_manager.py b/...r/worker_adapter/symphony/task_manager.py → ...r/worker_adapter/symphony/task_manager.py
diff --git a/scaler/worker_adapter/symphony/worker.py → src/scaler/worker_adapter/symphony/worker.py b/scaler/worker_adapter/symphony/worker.py → src/scaler/worker_adapter/symphony/worker.py
diff --git a/...worker_adapter/symphony/worker_adapter.py → ...worker_adapter/symphony/worker_adapter.py b/...worker_adapter/symphony/worker_adapter.py → ...worker_adapter/symphony/worker_adapter.py
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -37,7 +37,4 @@ endfunction()
 if(LINUX OR APPLE)
   # Add the directory for the C++ tests.
   add_subdirectory(cpp)
-
-  # Add the new directory for io tests.
-  add_subdirectory(io/ymq)
 endif()
diff --git a/tests/client/__init__.py b/tests/client/__init__.py
diff --git a/tests/test_client.py → tests/client/test_client.py b/tests/test_client.py → tests/client/test_client.py
@@ -11,7 +11,7 @@
 from scaler.utility.logging.scoped_logger import ScopedLogger
 from scaler.utility.logging.utility import setup_logger
 from scaler.worker.preload import PreloadSpecError, _parse_preload_spec, execute_preload
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 
 def noop(sec: int):
@@ -34,7 +34,7 @@ def raise_exception(foo: int):
 
 def get_preloaded_value():
     """Function that retrieves value set by preload"""
-    from tests.utility import get_global_value
+    from tests.utility.utility import get_global_value
 
     return get_global_value()
 
@@ -364,7 +364,9 @@ def _create_preload_cluster(self, preload: str, logging_paths: tuple = ("/dev/st
         return preload_cluster
 
     def test_preload_success(self):
-        preload_cluster = self._create_preload_cluster(preload="tests.utility:setup_global_value('test_preload_value')")
+        preload_cluster = self._create_preload_cluster(
+            preload="tests.utility.utility:setup_global_value('test_preload_value')"
+        )
 
         try:
             preload_cluster.start()
@@ -390,7 +392,7 @@ def test_preload_failure(self):
 
         try:
             preload_cluster = self._create_preload_cluster(
-                preload="tests.utility:failing_preload()", logging_paths=(log_path,)
+                preload="tests.utility.utility:failing_preload()", logging_paths=(log_path,)
             )
 
             try:
@@ -406,7 +408,7 @@ def test_preload_failure(self):
                             processor_log_content += f.read()
 
                 # Verify that the preload failure was logged properly
-                self.assertIn("preloading: tests.utility:failing_preload with args", processor_log_content)
+                self.assertIn("preloading: tests.utility.utility:failing_preload with args", processor_log_content)
 
                 # If we reach here without any other exceptions, the test is successful
             finally:

diff --git a/tests/test_future.py → tests/client/test_future.py b/tests/test_future.py → tests/client/test_future.py
@@ -17,7 +17,7 @@
 from scaler.utility.identifiers import ClientID, ObjectID, TaskID
 from scaler.utility.logging.utility import setup_logger
 from scaler.utility.network_util import get_available_tcp_port
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 
 def noop_sleep(sec: int):

diff --git a/tests/cluster/__init__.py b/tests/cluster/__init__.py
diff --git a/tests/test_cluster.py → tests/cluster/test_cluster.py b/tests/test_cluster.py → tests/cluster/test_cluster.py
@@ -3,7 +3,7 @@
 from scaler import Client, SchedulerClusterCombo
 from scaler.utility.logging.utility import setup_logger
 from scaler.utility.network_util import get_available_tcp_port
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 
 class TestCluster(unittest.TestCase):

diff --git a/tests/test_cluster_config.py → tests/cluster/test_cluster_config.py b/tests/test_cluster_config.py → tests/cluster/test_cluster_config.py
diff --git a/tests/test_cluster_disconnect.py → tests/cluster/test_cluster_disconnect.py b/tests/test_cluster_disconnect.py → tests/cluster/test_cluster_disconnect.py
@@ -5,7 +5,7 @@
 from scaler import Client, Cluster, SchedulerClusterCombo
 from scaler.config.defaults import DEFAULT_LOGGING_PATHS
 from scaler.utility.logging.utility import setup_logger
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 
 def noop_sleep(sec: int):

diff --git a/tests/config/__init__.py b/tests/config/__init__.py
diff --git a/tests/test_config_types.py → tests/config/test_config_types.py b/tests/test_config_types.py → tests/config/test_config_types.py
diff --git a/tests/core/__init__.py b/tests/core/__init__.py
diff --git a/tests/test_async_indexed_queue.py → tests/core/test_async_indexed_queue.py b/tests/test_async_indexed_queue.py → tests/core/test_async_indexed_queue.py
@@ -3,7 +3,7 @@
 
 from scaler.utility.logging.utility import setup_logger
 from scaler.utility.queues.async_indexed_queue import AsyncIndexedQueue
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 
 class TestAsyncIndexedQueue(unittest.TestCase):

diff --git a/tests/test_async_priority_queue.py → tests/core/test_async_priority_queue.py b/tests/test_async_priority_queue.py → tests/core/test_async_priority_queue.py
@@ -3,7 +3,7 @@
 
 from scaler.utility.logging.utility import setup_logger
 from scaler.utility.queues.async_priority_queue import AsyncPriorityQueue
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 
 class TestAsyncPriorityQueue(unittest.TestCase):

diff --git a/tests/test_async_sorted_priority_queue.py → .../core/test_async_sorted_priority_queue.py b/tests/test_async_sorted_priority_queue.py → .../core/test_async_sorted_priority_queue.py
@@ -3,7 +3,7 @@
 
 from scaler.utility.logging.utility import setup_logger
 from scaler.utility.queues.async_sorted_priority_queue import AsyncSortedPriorityQueue
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 
 class TestSortedPriorityQueue(unittest.TestCase):

diff --git a/tests/test_death_timeout.py → tests/core/test_death_timeout.py b/tests/test_death_timeout.py → tests/core/test_death_timeout.py
@@ -16,7 +16,7 @@
 from scaler.config.types.zmq import ZMQConfig
 from scaler.utility.logging.utility import setup_logger
 from scaler.utility.network_util import get_available_tcp_port
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 # This is a manual test because it can loop infinitely if it fails
 

diff --git a/tests/test_indexed_queue.py → tests/core/test_indexed_queue.py b/tests/test_indexed_queue.py → tests/core/test_indexed_queue.py
@@ -2,7 +2,7 @@
 
 from scaler.utility.logging.utility import setup_logger
 from scaler.utility.queues.indexed_queue import IndexedQueue
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 
 class TestIndexedQueue(unittest.TestCase):

diff --git a/tests/test_profiling.py → tests/core/test_profiling.py b/tests/test_profiling.py → tests/core/test_profiling.py
@@ -4,7 +4,7 @@
 from scaler import Client, SchedulerClusterCombo
 from scaler.utility.logging.utility import setup_logger
 from scaler.utility.network_util import get_available_tcp_port
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 
 def dummy(n: int):

diff --git a/tests/test_protected.py → tests/core/test_protected.py b/tests/test_protected.py → tests/core/test_protected.py
@@ -4,7 +4,7 @@
 from scaler import Client, SchedulerClusterCombo
 from scaler.utility.logging.utility import setup_logger
 from scaler.utility.network_util import get_available_tcp_port
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 
 class TestProtected(unittest.TestCase):

diff --git a/tests/io/ymq/test_logging.cpp → tests/cpp/ymq/test_logging.cpp b/tests/io/ymq/test_logging.cpp → tests/cpp/ymq/test_logging.cpp
diff --git a/tests/graph/__init__.py b/tests/graph/__init__.py
diff --git a/tests/test_graph.py → tests/graph/test_graph.py b/tests/test_graph.py → tests/graph/test_graph.py
@@ -8,7 +8,7 @@
 from scaler.utility.graph.optimization import cull_graph
 from scaler.utility.logging.scoped_logger import ScopedLogger
 from scaler.utility.logging.utility import setup_logger
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 
 def inc(i):

diff --git a/tests/io/ymq/CMakeLists.txt b/tests/io/ymq/CMakeLists.txt
diff --git a/tests/object_storage/__init__.py b/tests/object_storage/__init__.py
diff --git a/tests/test_object_usage.py → tests/object_storage/test_object_usage.py b/tests/test_object_usage.py → tests/object_storage/test_object_usage.py
@@ -3,7 +3,7 @@
 
 from scaler.scheduler.object_usage.object_tracker import ObjectTracker, ObjectUsage
 from scaler.utility.logging.utility import setup_logger
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 
 @dataclasses.dataclass

diff --git a/tests/scheduler/__init__.py b/tests/scheduler/__init__.py
diff --git a/tests/test_balance.py → tests/scheduler/test_balance.py b/tests/test_balance.py → tests/scheduler/test_balance.py
@@ -6,7 +6,7 @@
 from scaler.config.defaults import DEFAULT_LOAD_BALANCE_SECONDS
 from scaler.utility.logging.utility import setup_logger
 from scaler.utility.network_util import get_available_tcp_port
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 
 def sleep_and_return_pid(sec: int):

diff --git a/tests/test_capabilities.py → tests/scheduler/test_capabilities.py b/tests/test_capabilities.py → tests/scheduler/test_capabilities.py
@@ -4,7 +4,7 @@
 from scaler import Client, Cluster, SchedulerClusterCombo
 from scaler.scheduler.allocate_policy.allocate_policy import AllocatePolicy
 from scaler.utility.logging.utility import setup_logger
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 
 class TestCapabilities(unittest.TestCase):

diff --git a/tests/test_capability_allocate_policy.py → ...eduler/test_capability_allocate_policy.py b/tests/test_capability_allocate_policy.py → ...eduler/test_capability_allocate_policy.py
@@ -5,7 +5,7 @@
 from scaler.scheduler.allocate_policy.capability_allocate_policy import CapabilityAllocatePolicy
 from scaler.utility.identifiers import ClientID, TaskID, WorkerID
 from scaler.utility.logging.utility import setup_logger
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 MAX_TASKS_PER_WORKER = 10
 

diff --git a/tests/test_scaling.py → tests/scheduler/test_scaling.py b/tests/test_scaling.py → tests/scheduler/test_scaling.py
@@ -30,7 +30,7 @@
 from scaler.utility.logging.utility import setup_logger
 from scaler.utility.network_util import get_available_tcp_port
 from scaler.worker_adapter.native import NativeWorkerAdapter
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 
 def _run_native_worker_adapter(address: str, webhook_port: int) -> None:

diff --git a/tests/test_scheduler_config.py → tests/scheduler/test_scheduler_config.py b/tests/test_scheduler_config.py → tests/scheduler/test_scheduler_config.py
diff --git a/tests/serializer/__init__.py b/tests/serializer/__init__.py
diff --git a/tests/test_serializer.py → tests/serializer/test_serializer.py b/tests/test_serializer.py → tests/serializer/test_serializer.py
@@ -10,7 +10,7 @@
 from scaler.utility.logging.scoped_logger import ScopedLogger
 from scaler.utility.logging.utility import setup_logger
 from scaler.utility.network_util import get_available_tcp_port
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 
 def noop(sec: int):

diff --git a/tests/task/__init__.py b/tests/task/__init__.py
diff --git a/tests/test_nested_task.py → tests/task/test_nested_task.py b/tests/test_nested_task.py → tests/task/test_nested_task.py
@@ -2,7 +2,7 @@
 
 from scaler import Client, SchedulerClusterCombo
 from scaler.utility.logging.utility import setup_logger
-from tests.utility import logging_test_name
+from tests.utility.utility import logging_test_name
 
 N_TASKS = 30
 N_WORKERS = 3

diff --git a/tests/ui/__init__.py b/tests/ui/__init__.py